Repository: nifi Updated Branches: refs/heads/NIFI-655 7851a4f50 -> a16d8c35c
NIFI-655: - Removing unused spring configuration files. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1925392a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1925392a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1925392a Branch: refs/heads/NIFI-655 Commit: 1925392a988b09eac83efd83210c9b0679b81bd5 Parents: 7851a4f Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Mon Nov 9 17:46:09 2015 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Mon Nov 9 17:46:09 2015 -0500 ---------------------------------------------------------------------- .../apache/nifi/web/NiFiWebUiConfiguration.java | 35 ---------------- .../web/NiFiWebUiSecurityConfiguration.java | 44 -------------------- .../nifi-web-ui/src/main/webapp/WEB-INF/web.xml | 13 ------ 3 files changed, 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/1925392a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiConfiguration.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiConfiguration.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiConfiguration.java deleted file mode 100644 index 320655a..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiConfiguration.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.web; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.ImportResource; - -/** - * - */ -@Configuration -@Import({NiFiWebUiSecurityConfiguration.class}) -@ImportResource({"classpath:nifi-context.xml", - "classpath:nifi-administration-context.xml", - "classpath:nifi-cluster-manager-context.xml", - "classpath:nifi-cluster-protocol-context.xml", - "classpath:nifi-web-security-context.xml"}) -public class NiFiWebUiConfiguration { - -} http://git-wip-us.apache.org/repos/asf/nifi/blob/1925392a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiSecurityConfiguration.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiSecurityConfiguration.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiSecurityConfiguration.java deleted file mode 100644 index 5a1bb67..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/NiFiWebUiSecurityConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -/** - * NiFi Web Ui Security Config - */ -@Configuration -@EnableWebSecurity -public class NiFiWebUiSecurityConfiguration extends WebSecurityConfigurerAdapter { - - public NiFiWebUiSecurityConfiguration() { - super(true); // disable defaults - } - - @Override - protected void configure(final HttpSecurity http) throws Exception { - } - - @Autowired - public void configureGlobal(final AuthenticationManagerBuilder auth) throws Exception { - } -} http://git-wip-us.apache.org/repos/asf/nifi/blob/1925392a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml index 561bd39..17f4e41 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml @@ -16,19 +16,6 @@ <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>nifi</display-name> - <!-- spring secutiry configuration --> - <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.web</param-value> - </context-param> - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - <!-- servlet to map to canvas page --> <servlet> <servlet-name>NiFiCanvas</servlet-name>
