Repository: nifi-minifi Updated Branches: refs/heads/master 01d7ae23f -> 9fc758b88
MINIFI-456 Preferring org.glassfish.jersey.ext jersey-spring dependency to com.sun.jersey.contribs This closes #126. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/9fc758b8 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/9fc758b8 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/9fc758b8 Branch: refs/heads/master Commit: 9fc758b883af79ec4d3a3df3ed2beb37e7fac044 Parents: 01d7ae2 Author: Aldrin Piri <[email protected]> Authored: Wed May 16 14:14:37 2018 -0400 Committer: Aldrin Piri <[email protected]> Committed: Tue May 22 21:33:06 2018 -0400 ---------------------------------------------------------------------- minifi-c2/minifi-c2-assembly/pom.xml | 27 ++++++++----- .../main/resources/conf/minifi-c2-context.xml | 8 +--- minifi-c2/minifi-c2-jetty/pom.xml | 16 ++++++++ minifi-c2/minifi-c2-service/pom.xml | 6 +++ .../c2/configuration/C2ResourceConfig.java | 34 ++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 13 ++++-- minifi-c2/pom.xml | 13 ++++++ pom.xml | 42 -------------------- 8 files changed, 95 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-assembly/pom.xml b/minifi-c2/minifi-c2-assembly/pom.xml index d853e1b..7839d56 100644 --- a/minifi-c2/minifi-c2-assembly/pom.xml +++ b/minifi-c2/minifi-c2-assembly/pom.xml @@ -123,11 +123,6 @@ limitations under the License. <scope>compile</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> <scope>compile</scope> @@ -143,14 +138,24 @@ limitations under the License. <scope>compile</scope> </dependency> <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-spring</artifactId> - <scope>compile</scope> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-spring4</artifactId> + <version>${jersey.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>compile</scope> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-jetty-http</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml index 0e0bc33..da0ed65 100644 --- a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml @@ -18,13 +18,7 @@ <beans default-lazy-init="true" xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:util="http://www.springframework.org/schema/util"; - xmlns:context="http://www.springframework.org/schema/context"; - xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";> <bean id="configService" class="org.apache.nifi.minifi.c2.service.ConfigService" scope="singleton"> <constructor-arg> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-jetty/pom.xml b/minifi-c2/minifi-c2-jetty/pom.xml index d545d8c..6a5492b 100644 --- a/minifi-c2/minifi-c2-jetty/pom.xml +++ b/minifi-c2/minifi-c2-jetty/pom.xml @@ -32,6 +32,14 @@ limitations under the License. <version>${project.version}</version> </dependency> <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-spring4</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> </dependency> @@ -39,5 +47,13 @@ limitations under the License. <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-service/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-service/pom.xml b/minifi-c2/minifi-c2-service/pom.xml index 85d11fd..024efe1 100644 --- a/minifi-c2/minifi-c2-service/pom.xml +++ b/minifi-c2/minifi-c2-service/pom.xml @@ -89,5 +89,11 @@ limitations under the License. <artifactId>swagger-annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>${jersey.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/configuration/C2ResourceConfig.java ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/configuration/C2ResourceConfig.java b/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/configuration/C2ResourceConfig.java new file mode 100644 index 0000000..5ed07b2 --- /dev/null +++ b/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/configuration/C2ResourceConfig.java @@ -0,0 +1,34 @@ +/* + * 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.nifi.minifi.c2.configuration; + +import org.glassfish.jersey.server.ResourceConfig; +import org.springframework.context.ApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +import javax.servlet.ServletContext; +import javax.ws.rs.core.Context; + +public class C2ResourceConfig extends ResourceConfig { + + public C2ResourceConfig(@Context ServletContext servletContext) { + final ApplicationContext appCtx = WebApplicationContextUtils.getWebApplicationContext(servletContext); + + register(appCtx.getBean("configService")); + } +} http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml b/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml index 7be7364..b9efff8 100644 --- a/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml +++ b/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml @@ -17,24 +17,29 @@ --> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> <display-name>minifi-c2</display-name> + <context-param> <param-name>contextClass</param-name> <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value> </context-param> + <context-param> <param-name>contextConfigLocation</param-name> - <param-value>org.apache.nifi.minifi.c2.configuration</param-value> + <param-value>org.apache.nifi.minifi.c2.configuration.Configuration</param-value> </context-param> + <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> + <servlet> <servlet-name>jerseySpring</servlet-name> - <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class> + <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> <init-param> - <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name> - <param-value>true</param-value> + <param-name>javax.ws.rs.Application</param-name> + <param-value>org.apache.nifi.minifi.c2.configuration.C2ResourceConfig</param-value> </init-param> + <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>jerseySpring</servlet-name> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/minifi-c2/pom.xml ---------------------------------------------------------------------- diff --git a/minifi-c2/pom.xml b/minifi-c2/pom.xml index 364a4b4..19f9186 100644 --- a/minifi-c2/pom.xml +++ b/minifi-c2/pom.xml @@ -35,4 +35,17 @@ limitations under the License. <module>minifi-c2-docker</module> <module>minifi-c2-integration-tests</module> </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.glassfish.jersey</groupId> + <artifactId>jersey-bom</artifactId> + <version>${jersey.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + </project> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/9fc758b8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e505107..feea1e8 100644 --- a/pom.xml +++ b/pom.xml @@ -749,38 +749,6 @@ limitations under the License. </exclusions> </dependency> <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-spring</artifactId> - <version>1.19.4</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-multipart</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> <version>${spring.version}</version> @@ -1082,21 +1050,11 @@ limitations under the License. <version>${jersey.version}</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> <version>${jersey.version}</version> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> <version>${jetty.version}</version>
