You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/16 10:14:23 UTC
[11/12] git commit: [OLINGO-362] OAuth2 supporting abstract class
provided + concrete CXF-based IT
[OLINGO-362] OAuth2 supporting abstract class provided + concrete CXF-based IT
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c541d925
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c541d925
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c541d925
Branch: refs/heads/master
Commit: c541d9251b4ee36442cfdf9b18984892c1d2b819
Parents: d9c6b08
Author: Francesco Chicchiriccò <--global>
Authored: Wed Jul 16 10:05:04 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Wed Jul 16 10:05:04 2014 +0200
----------------------------------------------------------------------
LICENSE | 202 ++++
NOTICE | 8 +
README | 64 ++
fit/pom.xml | 44 +-
.../org/apache/olingo/fit/AbstractServices.java | 763 ++++++-------
.../fit/UnsupportedMediaTypeException.java | 12 +-
.../apache/olingo/fit/V3ActionOverloading.java | 59 +-
.../org/apache/olingo/fit/V3KeyAsSegment.java | 105 +-
.../java/org/apache/olingo/fit/V3OpenType.java | 53 +-
.../org/apache/olingo/fit/V3PrimitiveKeys.java | 10 +-
.../java/org/apache/olingo/fit/V3Services.java | 190 ++--
.../main/java/org/apache/olingo/fit/V4Demo.java | 89 +-
.../org/apache/olingo/fit/V4KeyAsSegment.java | 82 +-
.../java/org/apache/olingo/fit/V4NorthWind.java | 5 +-
.../org/apache/olingo/fit/V4NorthWindExt.java | 9 +-
.../java/org/apache/olingo/fit/V4OAuth2.java | 37 +
.../java/org/apache/olingo/fit/V4OpenType.java | 49 +-
.../java/org/apache/olingo/fit/V4Services.java | 8 +-
.../org/apache/olingo/fit/V4Vocabularies.java | 25 +-
.../olingo/fit/rest/OAuth2InInterceptor.java | 97 ++
.../apache/olingo/fit/rest/OAuth2Provider.java | 133 +++
.../rest/ResolvingReferencesInterceptor.java | 59 +
.../fit/rest/ServiceNameResponseFilter.java | 55 +
.../fit/rest/StaticSecurityInterceptor.java | 85 ++
.../olingo/fit/rest/XHTTPMethodInterceptor.java | 47 +
.../olingo/fit/utils/AbstractUtilities.java | 2 +-
.../apache/olingo/fit/utils/JSONUtilities.java | 68 +-
.../utils/ResolvingReferencesInterceptor.java | 57 -
.../fit/utils/XHTTPMethodInterceptor.java | 45 -
.../apache/olingo/fit/utils/XMLUtilities.java | 3 +-
fit/src/main/resources/META-INF/LICENSE | 1047 ++++++++++++++++++
.../main/webapp/WEB-INF/applicationContext.xml | 37 +-
.../fit/CXFOAuth2HttpUriRequestFactory.java | 130 +++
.../olingo/fit/v4/AbstractTestITCase.java | 29 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 4 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 14 +-
.../apache/olingo/fit/v4/OAuth2TestITCase.java | 107 ++
.../communication/request/AbstractRequest.java | 24 +-
.../response/AbstractODataResponse.java | 1 -
.../AbstractOAuth2HttpUriRequestFactory.java | 52 +
.../client/core/http/OAuth2Exception.java | 29 +
lib/server-core/pom.xml | 4 +-
lib/server-tecsvc/pom.xml | 3 +
.../src/main/resources/META-INF/LICENSE | 331 ++++++
pom.xml | 295 +++--
45 files changed, 3550 insertions(+), 1022 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c541d925/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c541d925/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..65d59ef
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Olingo
+Copyright 2013-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c541d925/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..85bceaa
--- /dev/null
+++ b/README
@@ -0,0 +1,64 @@
+==========================
+Apache Olingo
+==========================
+
+Apache Olingo is a Java library and extensions around
+the OData specification.
+
+Apache Olingo supports the specification versions
+ - OData 4.0 <http://www.odata.org/documentation/odata-version-4-0/>
+
+Building Apache Olingo
+======================
+
+You can build Apache Olingo like this:
+
+ mvn clean install
+
+You need Maven 3 with Java 6 (or higher) for the build.
+Set the environment variable MAVEN_OPTS to
+'-Xmx1024m -XX:MaxPermSize=256m' to give Maven more memory.
+
+Documentation
+=============
+
+The project documentation is available here:
+
+http://olingo.apache.org/
+
+License (see also package specific LICENSE files)
+=================================================
+
+Collective work: Copyright 2014 The Apache Software Foundation.
+
+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.
+
+Dependencies with "Weak Copyleft" or dual licenses
+==================================================
+
+Apache Olingo uses some libraries with open source licenses that require reciprocal
+licensing when modified. These libraries are included in unmodified binary
+form and can be redistributed under terms that are compatible with the
+Apache License.
+
+Some libraries used by Apache Olingo are dual-licensed under different open source
+licenses. These libraries are redistributed under the license whose terms
+are compatible with the Apache License.
+
+See LICENSE file included in all Apache Olingo packages for
+full licensing details.
+
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c541d925/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 84d4eac..742be22 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -20,7 +20,7 @@
-->
<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">
+ 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>olingo-fit</artifactId>
@@ -49,10 +49,31 @@
<!-- REST services CXF -->
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-oauth2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
@@ -113,6 +134,17 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>target/maven-shared-archive-resources</directory>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -149,9 +181,9 @@
<webResources>
<resource>
<directory>${project.build.outputDirectory}</directory>
- <includes>
+ <!--<includes>
<include>META-INF/DEPENDENCIES*</include>
- </includes>
+ </includes>-->
</resource>
</webResources>
<packagingExcludes>WEB-INF/classes/esigate.properties,WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
@@ -239,11 +271,5 @@
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
</build>
</project>