Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DF51108FE for ; Sat, 20 Jul 2013 18:35:58 +0000 (UTC) Received: (qmail 33968 invoked by uid 500); 20 Jul 2013 18:35:58 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 33866 invoked by uid 500); 20 Jul 2013 18:35:56 -0000 Mailing-List: contact commits-help@falcon.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.incubator.apache.org Delivered-To: mailing list commits@falcon.incubator.apache.org Received: (qmail 33850 invoked by uid 99); 20 Jul 2013 18:35:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jul 2013 18:35:54 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 20 Jul 2013 18:35:53 +0000 Received: (qmail 33671 invoked by uid 99); 20 Jul 2013 18:35:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jul 2013 18:35:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6872B8AFBC1; Sat, 20 Jul 2013 18:35:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sriksun@apache.org To: commits@falcon.incubator.apache.org Date: Sat, 20 Jul 2013 18:35:34 -0000 Message-Id: In-Reply-To: <1bdbb553618d4bbfaa5628fed8b629fa@git.apache.org> References: <1bdbb553618d4bbfaa5628fed8b629fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: FALCON-52 Main module configured used with jetty:run has issues with app start. Contributed by Srikanth Sundarrajan X-Virus-Checked: Checked by ClamAV on apache.org 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/c823ce17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/c823ce17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/c823ce17 Branch: refs/heads/v0.3 Commit: c823ce1756b4da87c118f0631c76a8ce9dc35a54 Parents: 49baa28 Author: srikanth.sundarrajan Authored: Sat Jul 20 23:48:36 2013 +0530 Committer: srikanth.sundarrajan Committed: Sat Jul 20 23:48:36 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/c823ce17/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5ba3339..4c655c8 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ Release Version: 0.3 IMPROVEMENTS + 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/c823ce17/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(); } }