Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C4E6D58B for ; Tue, 18 Dec 2012 15:48:30 +0000 (UTC) Received: (qmail 34079 invoked by uid 500); 18 Dec 2012 15:48:30 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 34040 invoked by uid 500); 18 Dec 2012 15:48:29 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 34033 invoked by uid 99); 18 Dec 2012 15:48:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 15:48:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 15:48:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 485062388A91; Tue, 18 Dec 2012 15:48:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423484 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala Date: Tue, 18 Dec 2012 15:48:05 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121218154806.485062388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Tue Dec 18 15:48:05 2012 New Revision: 1423484 URL: http://svn.apache.org/viewvc?rev=1423484&view=rev Log: Be a little smarter when running Apollo from an IDE so that the webconsole can work if the project it not compiled to the expected directory. Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala?rev=1423484&r1=1423483&r2=1423484&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala (original) +++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/JettyWebServer.scala Tue Dec 18 15:48:05 2012 @@ -116,8 +116,10 @@ object JettyWebServer extends Log { if( url.getProtocol == "file") { // we are probably being run from an IDE... val classes_dir = new File( url.getFile.stripSuffix("/"+bootClazz) ) - if( classes_dir.isDirectory ) { + if( (classes_dir/".."/".."/"src"/"main"/"webapp").isDirectory ) { classes_dir/".."/".."/"src"/"main"/"webapp" + } else if( (classes_dir/".."/".."/"apollo-web"/"src"/"main"/"webapp").isDirectory ) { + classes_dir/".."/".."/"apollo-web"/"src"/"main"/"webapp" } else { null }