activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
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 GMT
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
           }



Mime
View raw message