Added support for web development mode (JM-620).

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3664 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -172,6 +172,7 @@ admin.error.license=Nelze licencovat dopln\u011bk {0}
 admin.console.warning=Varov\u00e1n\u00ed: administr\u00e1torsk\u00e1 konzole nebyla spu\u0161t\u011bna kv\u016fli konfigura\u010dn\u00edm nastaven\u00edm.
 admin.console.restarting=Administr\u00e1torsk\u00e1 konzole restartuje...
 admin.console.listening=Administr\u00e1torsk\u00e1 konzole naslouch\u00e1 na
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_de.properties

@@ -172,6 +172,7 @@ admin.warn.license=Lizenzlimit \u00fcberschritten, Benutzerverbindung abgelehnt
 admin.error.license=Plugin {0} konnte nicht lizenziert werden
 admin.console.warning=Warnung: Adminkonsole nicht gestartet, Grund sind Konfigurationseinstellungen.
 admin.console.listening=Adminkonsole lauscht auf
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_en.properties

@@ -155,6 +155,7 @@
 ##      Added key: 'sidebar.system-cache'
 ##      Added key: 'sidebar.system-cache.descr'
 ##      Added key: 'ssl.settings.type'
+##      Added key: 'admin.console.devmode'
 ##      Added key: 'startup.starting.pubsub'
 ##      Added section: 'pubsub.*'
 ##      Added section: 'system.cache.*'
@@ -323,6 +324,7 @@ admin.error.license=Could not license plugin {0}
 admin.console.warning=Warning: admin console not started due to configuration settings.
 admin.console.restarting=Restarting admin console...
 admin.console.listening=Admin console listening at
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_es.properties

@@ -167,6 +167,7 @@ admin.error.license=No se pudo licenciar el plugin {0}
 admin.console.warning=Advertencia: la consola de administraci\u00f3n no se pudo iniciar a causa de errores de configuraci\u00f3n
 admin.console.restarting=Reinicializando la consola de administraci\u00f3n...
 admin.console.listening=Consola de administraci\u00f3n escuchando en
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_fr.properties

@@ -181,6 +181,7 @@ admin.console.warning=Avertissement : La console d'administration n'a pas \u00e9
      de param\u00e8tres de configuration.
 admin.console.restarting=Red\u00e9marrage de la console d'administration...
 admin.console.listening=Console d'administration en \u00e9coute sur
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_nl.properties

@@ -170,6 +170,7 @@ admin.warn.license=Licentie limit overschreden, gebruikersverbinding wordt tegen
 admin.error.license=Kan geen licentie verkrijgen voor de plug-in {0}
 admin.console.warning=Waarschuwing: Beheerdersconsole niet gestart als gevolg van de configuratie instellingen.
 admin.console.listening=Beheerdersconsole luisterend op
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_pl_PL.properties

@@ -174,7 +174,8 @@ admin.warn.license=Limit licencyjny przekroczony, odrzucono po\u0142\u0105czenie
 admin.error.license=Nie mo\u017cna by\u0142o zalicencjonowa\u0107 wtyczki {0}
 admin.console.warning=Ostrze\u017cenie: Konsola administracyjna nie zostanie uruchomiona z powodu b\u0142\u0119dnych ustawie\u0144 konfiguracyjnych.
 admin.console.restarting=Restart konsoli administracyjnej...
-admin.console.listening=Konsola administracyjna nas\u0142uchuje na 
+admin.console.listening=Konsola administracyjna nas\u0142uchuje na
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_pt_BR.properties

@@ -171,6 +171,7 @@ admin.error.license=N\u00e3o \u00e9 poss\u00edvel licenciar o plugin {0}
 admin.console.warning=Warning: Console de Administra\u00e7\u00e3o n\u00e3o iniciado devido a defini\u00e7\u00f5es de configura\u00e7\u00e3o.
 admin.console.restarting=Reiniciando o console de administra\u00e7\u00e3o...
 admin.console.listening=Console de Administra\u00e7\u00e3o ouvindo em
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/i18n/wildfire_i18n_zh_CN.properties

@@ -171,6 +171,7 @@ admin.error.license=\u65e0\u6cd5\u8bb8\u53ef\u63d2\u4ef6 {0}
 admin.console.warning=\u8b66\u544a\uff1a\u7531\u4e8e\u914d\u7f6e\u8bbe\u7f6e\u95ee\u9898\u7ba1\u7406\u5e73\u53f0\u4e0d\u80fd\u8fd0\u884c\u3002
 admin.console.restarting=\u91cd\u65b0\u542f\u52a8\u7ba1\u7406\u63a7\u5236\u5e73\u53f0...
 admin.console.listening=\u7ba1\u7406\u5e73\u53f0\u5f00\u59cb\u76d1\u542c
+admin.console.devmode=Using development mode
 
 # Server messages (to users)
 

src/java/org/jivesoftware/wildfire/container/AdminConsolePlugin.java

@@ -76,9 +76,18 @@ public class AdminConsolePlugin implements Plugin {
             jetty.removeContext(context);
             loadListeners();
 
-            // Add web-app
-            context = jetty.addWebApplication("/",
+            // Add web-app. Check to see if we're in development mode. If so, we don't
+            // add the normal web-app location, but the web-app in the project directory.
+            if (Boolean.getBoolean("developmentMode")) {
+                System.out.println(LocaleUtils.getLocalizedString("admin.console.devmode"));
+                context = jetty.addWebApplication("/",
+                    pluginDir.getParentFile().getParentFile().getParent() + File.separator + "src" +
+                            File.separator + "web");
+            }
+            else {
+                context = jetty.addWebApplication("/",
                     pluginDir.getAbsoluteFile() + File.separator + "webapp");
+            }
             context.setWelcomeFiles(new String[]{"index.jsp"});
 
             jetty.start();
@@ -169,9 +178,18 @@ public class AdminConsolePlugin implements Plugin {
 
             loadListeners();
 
-            // Add web-app
-            context = jetty.addWebApplication("/",
+            // Add web-app. Check to see if we're in development mode. If so, we don't
+            // add the normal web-app location, but the web-app in the project directory.
+            if (Boolean.getBoolean("developmentMode")) {
+                System.out.println(LocaleUtils.getLocalizedString("admin.console.devmode"));
+                context = jetty.addWebApplication("/",
+                    pluginDir.getParentFile().getParentFile().getParent() + File.separator + "src" +
+                            File.separator + "web");
+            }
+            else {
+                context = jetty.addWebApplication("/",
                     pluginDir.getAbsoluteFile() + File.separator + "webapp");
+            }
             context.setWelcomeFiles(new String[]{"index.jsp"});
 
             jetty.start();