Resolving conflicts when merging develop into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d19471d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d19471d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d19471d6 Branch: refs/heads/NIFI-250 Commit: d19471d6da17974ab6485f3653b4d793b30e895c Parents: 65e35e4 Author: Matt Gilman <[email protected]> Authored: Mon Mar 23 08:20:04 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Mon Mar 23 08:20:04 2015 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 5 ----- .../java/org/apache/nifi/web/server/JettyServer.java | 11 ++++------- .../org/apache/nifi/web/controller/ControllerFacade.java | 6 +----- 3 files changed, 5 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d19471d6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml index 8213a15..4db9637 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml @@ -170,11 +170,6 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> - <artifactId>nifi-ui-extension-controller</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-cluster</artifactId> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d19471d6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java index 16a213d..941f25b 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java @@ -231,7 +231,7 @@ public class JettyServer implements NiFiServer { @Deprecated List<String> customUiProcessorTypes = getWarExtensions(war, "META-INF/nifi-processor"); - // see if this war is a custom processor ui + // see if this war is a content viewer List<String> contentViewerMimeTypes = getWarExtensions(war, "META-INF/nifi-content-viewer"); // identify all known extension types in the war @@ -677,16 +677,13 @@ public class JettyServer implements NiFiServer { } } - // ensure web api is loaded and inject the ui extensions - if (webApiContext != null) { - final ServletContext webApiServletContext = webApiContext.getServletHandler().getServletContext(); - webApiServletContext.setAttribute("nifi-ui-extensions", uiExtensions); - } - // ensure the appropriate wars deployed successfully before injecting the NiFi context and security filters - // this must be done after starting the server (and ensuring there were no start up failures) if (webApiContext != null) { final ServletContext webApiServletContext = webApiContext.getServletHandler().getServletContext(); + webApiServletContext.setAttribute("nifi-ui-extensions", uiExtensions); + + // get the application context final WebApplicationContext webApplicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(webApiServletContext); // @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d19471d6/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java index 5770697..a373f05 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java @@ -37,10 +37,6 @@ import java.util.concurrent.TimeUnit; import javax.ws.rs.WebApplicationException; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.nifi.admin.service.UserService; -import org.apache.nifi.authorization.DownloadAuthorization; import org.apache.nifi.cluster.protocol.NodeIdentifier; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.connectable.Connectable; @@ -65,7 +61,6 @@ import org.apache.nifi.groups.ProcessGroupCounts; import org.apache.nifi.groups.RemoteProcessGroup; import org.apache.nifi.nar.ExtensionManager; import org.apache.nifi.nar.NarCloseable; -import org.apache.nifi.processor.DataUnit; import org.apache.nifi.processor.Processor; import org.apache.nifi.processor.QueueSize; import org.apache.nifi.processor.Relationship; @@ -117,6 +112,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.nifi.admin.service.UserService; import org.apache.nifi.authorization.DownloadAuthorization; import org.apache.nifi.processor.DataUnit; +import org.apache.nifi.web.security.user.NiFiUserUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException;
