Repository: zeppelin Updated Branches: refs/heads/master 9608f4960 -> c61e08de1
Replace CXF with Jersey2 [ZEPPELIN-903] ### What is this PR for? Use jersey2 instead of CXF to manage JSON REST requests and responses. Jersey2 can better manage the JSON bodies and mappings, mapping the json attributes to a POJO (getter/setter) being given as parameter of the method. ### What type of PR is it? [Improvement] ### Todos ### What is the Jira issue? - https://issues.apache.org/jira/browse/ZEPPELIN-903 ### How should this be tested? Build, run and check the ### Screenshots (if appropriate) N/A ### Questions: - Does the licenses files need update? Y - Is there breaking changes for older versions? N - Does this needs documentation? N Author: Eric Charles <e...@datalayer.io> Closes #932 from echarles/jersey2 and squashes the following commits: 767f15a6 [Eric Charles] Merge branch 'master' into jersey2 624fc251 [Eric Charles] Merge branch 'master' into jersey2 0099da58 [Eric Charles] Merge branch 'master' into jersey2 62140765 [Eric Charles] Merge branch 'master' into jersey2 71c93b82 [Eric Charles] rename local cxfContext variable 851dd576 [Eric Charles] Merge branch 'master' into jersey2 a5caf26b [Eric Charles] Merge branch 'master' into jersey2 ff04acaa [Eric Charles] clean merged content in LICENSE file 01dcc096 [Eric Charles] revert back to scala 2.10 c908697e [Eric Charles] merge with master 39543dec [Eric Charles] Merge branch 'master' of https://github.com/apache/zeppelin ebe7ebb3 [Eric Charles] Automatic message for commit of samedi 18 mars 2017, 11:23:13 (UTC+0000) 1344a20d [Eric Charles] Merge branch 'master' into jersey2 2881e5ac [Eric Charles] CDDL2 does not exist + get rid of javax.annotation released under JDL, it is shipped in JRE d39c5aa0 [Eric Charles] Merge branch 'master' into jersey2 c42d40c9 [Eric Charles] Move LICENSE-jersey-2 to zeppelin-distribution/src/bin_license 0634977a [Eric Charles] Add more licenses 7dafe841 [Eric Charles] Merge branch 'master' into jersey2 587d3660 [Eric Charles] Document jersey 2 license 82d98672 [Eric Charles] merge with master 326819d0 [Eric Charles] Merge branch 'master' into jersey2 f25b695b [Eric Charles] Merge branch 'master' into jersey2 a7b7a871 [Eric Charles] Remove remaining jersey1 dep 99e45025 [Eric Charles] Merge branch 'master' into jersey2 d149a728 [Eric Charles] Ensure dependency convergence dbac7d9c [Eric Charles] Fix code style 9eef80cb [Eric Charles] Replace CXF with Jersey2 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c61e08de Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c61e08de Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c61e08de Branch: refs/heads/master Commit: c61e08de1f4c2686963d7d216207783a4369a5bd Parents: 9608f49 Author: Eric Charles <e...@datalayer.io> Authored: Thu May 4 09:19:13 2017 +0200 Committer: Jongyoul Lee <jongy...@apache.org> Committed: Fri Jun 2 12:07:55 2017 +0900 ---------------------------------------------------------------------- zeppelin-distribution/src/bin_license/LICENSE | 7 +- .../src/bin_license/licenses/LICENSE-jersey-2 | 130 +++++++++++++++++++ zeppelin-server/pom.xml | 113 ++++++++-------- .../apache/zeppelin/server/ZeppelinServer.java | 15 ++- zeppelin-web/src/WEB-INF/web.xml | 11 +- 5 files changed, 200 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c61e08de/zeppelin-distribution/src/bin_license/LICENSE ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 32822c5..37fc936 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -32,7 +32,6 @@ The following components are provided under Apache License. (Apache 2.0) Apache Avro (org.apache.avro:avro:1.7.7 - http://avro.apache.org) (Apache 2.0) Apache Curator (org.apache.curator:curator:2.4.0 - http://curator.apache.org/) (Apache 2.0) Apache Cassandra (http://cassandra.apache.org/) - (Apache 2.0) Apache CXF (http://cxf.apache.org/) (Apache 2.0) Apache HBase (http://hbase.apache.org/) (Apache 2.0) Apache Ignite (http://ignite.apache.org/) (Apache 2.0) Apache Kylin (http://kylin.apache.org/) @@ -118,6 +117,7 @@ The following components are provided under Apache License. (Apache 2.0) Utility classes for Jetty (org.mortbay.jetty:jetty-util:6.1.26 - http://javadox.com/org.mortbay.jetty/jetty/6.1.26/overview-tree.html) (Apache 2.0) Servlet API (org.mortbay.jetty:servlet-api:2.5-20081211 - https://en.wikipedia.org/wiki/Jetty_(web_server)) (Apache 2.0) Google HTTP Client Library for Java (com.google.http-client:google-http-client-jackson2:1.21.0 - https://github.com/google/google-http-java-client/tree/dev/google-http-client-jackson2) + (Apache 2.0) validation-api (javax.validation - http://beanvalidation.org/) (Apache 2.0) pegdown (org.pegdown:pegdown:1.6.0 - https://github.com/sirthias/pegdown) (Apache 2.0) parboiled-java (org.parboiled:parboiled-java:1.1.7 - https://github.com/sirthias/parboiled) (Apache 2.0) parboiled-core (org.parboiled:parboiled-core:1.1.7 - https://github.com/sirthias/parboiled) @@ -349,9 +349,10 @@ The following components are provided under the CDDL License. (CDDL 1.0) javax.activation (javax.activation:activation:jar:1.1.1 - http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp) (CDDL 1.0) java.annotation (javax.annotation:javax.annotation-api:jar:1.2:compile - http://jcp.org/en/jsr/detail?id=250) - (CDDL 1.1) Jersey (com.sun.jersey:jersey:jar:1.9 - https://jersey.java.net/) (CDDL 1.1) jersey-core (org.glassfish.jersey.core:jersey-core:2.22.2 - https://jersey.java.net/) - (CDDL 1.1) hk2 (org.glassfish.hk2 - https://hk2.java.net/2.5.0-b03/) + (CDDL 1.0) javax.ws.rs-api (javax.ws.rs - https://jax-rs-spec.java.net/) + (CDDL 1.1) jersey-client (org.glassfish.jersey.client:jersey-core:2.22.2 - https://jersey.java.net/) + (CDDL 1.1) jersey-media (org.glassfish.jersey.media:jersey-core:2.22.2 - https://jersey.java.net/) (CDDL 1.1) jersey-core (com.sun.jersey:jersey-core:1.9 - https://jersey.java.net/jersey-core/) (CDDL 1.1) jersey-json (com.sun.jersey:jersey-json:1.9 - https://jersey.java.net/jersey-json/) (CDDL 1.1) jersey-server (com.sun.jersey:jersey-server:1.9 - https://jersey.java.net/jersey-server/) http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c61e08de/zeppelin-distribution/src/bin_license/licenses/LICENSE-jersey-2 ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/licenses/LICENSE-jersey-2 b/zeppelin-distribution/src/bin_license/licenses/LICENSE-jersey-2 new file mode 100644 index 0000000..f0878cc --- /dev/null +++ b/zeppelin-distribution/src/bin_license/licenses/LICENSE-jersey-2 @@ -0,0 +1,130 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL - Version 1.1) + +1. Definitions. + + 1.1. âContributorâ means each individual or entity that creates or contributes to the creation of Modifications. + + 1.2. âContributor Versionâ means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + + 1.3. âCovered Softwareâ means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + + 1.4. âExecutableâ means the Covered Software in any form other than Source Code. + + 1.5. âInitial Developerâ means the individual or entity that first makes Original Software available under this License. + + 1.6. âLarger Workâ means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + + 1.7. âLicenseâ means this document. + + 1.8. âLicensableâ means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + + 1.9. âModificationsâ means the Source Code and Executable form of any of the following: + + A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + + B. Any new file that contains any part of the Original Software or previous Modification; or + + C. Any new file that is contributed or otherwise made available under the terms of this License. + + 1.10. âOriginal Softwareâ means the Source Code and Executable form of computer software code that is originally released under this License. + + 1.11. âPatent Claimsâ means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + + 1.12. âSource Codeâ means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + + 1.13. âYouâ (or âYourâ) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, âYouâ includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, âcontrolâ means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants. + + 2.1. The Initial Developer Grant. + + Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: + + (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). + + (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. + + 2.2. Contributor Grant. + + Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: + + (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). + + (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party. + + (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. + +3. Distribution Obligations. + + 3.1. Availability of Source Code. + + Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange. + + 3.2. Modifications. + + The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. + + 3.3. Required Notices. + + You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. + + 3.4. Application of Additional Terms. + + You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipientsâ rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. + + 3.5. Distribution of Executable Versions. + + You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipientâs rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. + + 3.6. Larger Works. + + You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. + +4. Versions of the License. + + 4.1. New Versions. + + Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License. + + 4.2. Effect of New Versions. + + You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. + + 4.3. Modified Versions. + + When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN âAS ISâ BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. +6. TERMINATION. + + 6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. + + 6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as âParticipantâ) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a writ ten agreement with Participant. + + 6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. + + 6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYâS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a âcommercial item,â as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of âcommercial computer softwareâ (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and âcommercial computer software documentationâ as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License. +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictionâs conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneysâ fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract sh all be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c61e08de/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index ac5cb2b..bf4f52a 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -34,11 +34,12 @@ <properties> <!--library versions--> - <cxf.version>2.7.8</cxf.version> + <commons.httpclient.version>4.3.6</commons.httpclient.version> + <jersey.version>2.22.2</jersey.version> <hadoop-common.version>2.6.0</hadoop-common.version> <quartz.scheduler.version>2.2.1</quartz.scheduler.version> <jersey.servlet.version>1.13</jersey.servlet.version> - <javax.ws.rsapi.version>2.0-m10</javax.ws.rsapi.version> + <javax.ws.rsapi.version>2.0.1</javax.ws.rsapi.version> <libpam4j.version>1.8</libpam4j.version> <jna.version>4.1.0</jna.version> @@ -86,6 +87,12 @@ <groupId>${project.groupId}</groupId> <artifactId>zeppelin-zengine</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -99,6 +106,45 @@ </dependency> <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>${jersey.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>${jersey.version}</version> + </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.ws.rsapi.version}</version> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> @@ -131,54 +177,11 @@ <version>${jna.version}</version> </dependency> + <!-- Needed for dependency conergence --> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-api</artifactId> - <version>${cxf.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.5.4</version> </dependency> <dependency> @@ -293,18 +296,6 @@ </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - <version>${jersey.servlet.version}</version> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rsapi.version}</version> - </dependency> - - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <version>${scala.version}</version> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c61e08de/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java index 2b67dfd..826ae5f 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java @@ -27,7 +27,6 @@ import javax.servlet.DispatcherType; import javax.ws.rs.core.Application; import org.apache.commons.lang.StringUtils; -import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.shiro.web.env.EnvironmentLoaderListener; import org.apache.shiro.web.servlet.ShiroFilter; import org.apache.zeppelin.conf.ZeppelinConfiguration; @@ -286,7 +285,7 @@ public class ZeppelinServer extends Application { final ServletHolder servletHolder = new ServletHolder(notebookWsServer); servletHolder.setInitParameter("maxTextMessageSize", maxTextMessageSize); - final ServletContextHandler cxfContext = new ServletContextHandler( + final ServletContextHandler context = new ServletContextHandler( ServletContextHandler.SESSIONS); webapp.addServlet(servletHolder, "/ws/*"); @@ -316,13 +315,15 @@ public class ZeppelinServer extends Application { private static void setupRestApiContextHandler(WebAppContext webapp, ZeppelinConfiguration conf) { - final ServletHolder cxfServletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet()); - cxfServletHolder.setInitParameter("javax.ws.rs.Application", ZeppelinServer.class.getName()); - cxfServletHolder.setName("rest"); - cxfServletHolder.setForcedPath("rest"); + final ServletHolder servletHolder = new ServletHolder( + new org.glassfish.jersey.servlet.ServletContainer()); + + servletHolder.setInitParameter("javax.ws.rs.Application", ZeppelinServer.class.getName()); + servletHolder.setName("rest"); + servletHolder.setForcedPath("rest"); webapp.setSessionHandler(new SessionHandler()); - webapp.addServlet(cxfServletHolder, "/api/*"); + webapp.addServlet(servletHolder, "/api/*"); String shiroIniPath = conf.getShiroPath(); if (!StringUtils.isBlank(shiroIniPath)) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c61e08de/zeppelin-web/src/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/WEB-INF/web.xml b/zeppelin-web/src/WEB-INF/web.xml index e2514c9..4356b7c 100644 --- a/zeppelin-web/src/WEB-INF/web.xml +++ b/zeppelin-web/src/WEB-INF/web.xml @@ -23,11 +23,12 @@ <display-name>zeppelin-web</display-name> <servlet> <servlet-name>default</servlet-name> - <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> - <init-param> - <param-name>com.sun.jersey.config.property.packages</param-name> - <param-value>org.apache.zeppelin.rest</param-value> - </init-param> + <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> + <init-param> + <param-name>jersey.config.server.provider.packages</param-name> + <param-value>org.apache.zeppelin.rest</param-value> + </init-param> + <load-on-startup>1</load-on-startup> </servlet>
