Repository: incubator-nifi Updated Branches: refs/heads/NIFI-169 8fb78d2a5 -> d9dab0061
NIFI-173 fixed web war finding Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d9dab006 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d9dab006 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d9dab006 Branch: refs/heads/NIFI-169 Commit: d9dab00612521ba5dd49d8b78c6593b082834c3f Parents: 8fb78d2 Author: joewitt <joew...@apache.org> Authored: Tue Dec 16 11:46:37 2014 -0500 Committer: joewitt <joew...@apache.org> Committed: Tue Dec 16 11:46:37 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/web/server/JettyServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d9dab006/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java index 9ed29ff..3900cfc 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java +++ b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java @@ -273,7 +273,7 @@ public class JettyServer implements NiFiServer { // consider each nar working directory for (final File narWorkingDirectory : narWorkingDirectories) { - final File narDependencies = new File(narWorkingDirectory, "META-INF/dependencies"); + final File narDependencies = new File(narWorkingDirectory, "META-INF/bundled-dependencies"); if (narDependencies.isDirectory()) { // list the wars from this nar final File[] narDependencyDirs = narDependencies.listFiles(WAR_FILTER);
