You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/07/20 20:35:35 UTC
[4/4] git commit: FALCON-52 Main module configured used with
jetty:run has issues with app start. Contributed by Srikanth Sundarrajan
FALCON-52 Main module configured used with jetty:run has issues with app start. Contributed by Srikanth Sundarrajan
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/caa0d26b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/caa0d26b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/caa0d26b
Branch: refs/heads/master
Commit: caa0d26b916e4079ac2fb48f990521b677370095
Parents: 17ce0b0
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Sat Jul 20 23:49:46 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Sat Jul 20 23:49:46 2013 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
webapp/src/main/java/org/apache/falcon/Main.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/caa0d26b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8bdbf66..cc7a019 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Trunk (Unreleased)
Release Version: 0.3
+ FALCON-52 Main module configured used with jetty:run has issues with app
+ start. (Srikanth Sundarrajan)
+
FALCON-30 Enable embedding pig scripts directly in a process. (Venkatesh
Seetharam via Srikanth Sundarrajan)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/caa0d26b/webapp/src/main/java/org/apache/falcon/Main.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/falcon/Main.java b/webapp/src/main/java/org/apache/falcon/Main.java
index 9a296a0..9eb9e8a 100644
--- a/webapp/src/main/java/org/apache/falcon/Main.java
+++ b/webapp/src/main/java/org/apache/falcon/Main.java
@@ -45,14 +45,14 @@ public final class Main {
appPath = args[0];
dataDir = System.getProperty("activemq.base") + "/data";
}
- EmbeddedServer server = new EmbeddedServer(15000, appPath);
- server.start();
-
BrokerService broker = new BrokerService();
broker.setUseJmx(false);
broker.setDataDirectory(dataDir);
broker.addConnector("vm://localhost");
broker.addConnector("tcp://localhost:61616");
broker.start();
+
+ EmbeddedServer server = new EmbeddedServer(15000, appPath);
+ server.start();
}
}