Cleaned up property names (JM-91).

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

src/conf/jive-messenger.xml

@@ -11,16 +11,21 @@
             </name>
         </prop>
 		
-       Most properties are stored in the Jive Messenger database. A
+      Most properties are stored in the Jive Messenger database. A
 	property viewer and editor is included in the admin console.
 -->
 <!-- root element, all properties must be under this element -->
 <jive>
-    <embedded-web>
+    <adminConsole>
         <port>9090</port>
-    </embedded-web>
+        <!-- By default, only the user with the username "admin" can login 
+         to the admin console. Alternatively, you can specify a comma-delimitted 
+         list usernames that should be authorized to login by setting the  
+         <authorizedUsernames> field below. --> 
+        <!-- <authorizedUsernames></authorizedUsernames> -->
+    </adminConsole>
     
-    <!-- Example LDAP Settings -->
+    <!-- Example LDAP settings -->
     <!--
     <ldap>
         <host></host>
@@ -41,5 +46,5 @@
         </auth>
     </provider>
     -->
-    <!-- End Example LDAP Settings -->
+    <!-- End example LDAP settings -->
 </jive>
\ No newline at end of file

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

@@ -72,7 +72,7 @@ public class AdminConsolePlugin implements Plugin {
             
 
             // Configure HTTP socket listener
-            port = JiveGlobals.getProperty("embedded-web.port", "9090");
+            port = JiveGlobals.getProperty("adminConsole.port", "9090");
             jetty.addListener(port);
 
             // Add web-app

src/java/org/jivesoftware/messenger/launcher/Launcher.java

@@ -322,7 +322,7 @@ public class Launcher {
     private synchronized void launchBrowser() {
         try {
             XMLProperties props = new XMLProperties(configFile);
-            String port = props.getProperty("embedded-web.port");
+            String port = props.getProperty("adminConsole.port");
             BrowserLauncher.openURL("http://127.0.0.1:" + port + "/index.html");
         }
         catch (Exception e) {

src/web/login.jsp

@@ -23,17 +23,17 @@
 <% admin.init(request, response, session, application, out ); %>
 
 <%! // List of allowed usernames:
-    static Map allowedUsernames = null;
-    static String allowedUsernameProp = JiveGlobals.getProperty("admin.login.allowedUsernames");
+    static Map authorizedUsernames = null;
+    static String authorizedUsernameProp = JiveGlobals.getXMLProperty("adminConsole.authorizedUsernames");
     static {
-        if (allowedUsernameProp != null) {
-            StringTokenizer tokenizer = new StringTokenizer(allowedUsernameProp, ",");
+        if (authorizedUsernameProp != null) {
+            StringTokenizer tokenizer = new StringTokenizer(authorizedUsernameProp, ",");
             while (tokenizer.hasMoreTokens()) {
-                if (allowedUsernames == null) {
-                    allowedUsernames = new HashMap();
+                if (authorizedUsernames == null) {
+                    authorizedUsernames = new HashMap();
                 }
                 String tok = tokenizer.nextToken().trim();
-                allowedUsernames.put(tok, tok);
+                authorizedUsernames.put(tok, tok);
             }
         }
     }
@@ -66,8 +66,8 @@
 
 	if (ParamUtils.getBooleanParameter(request,"login")) {
 		try {
-            if (allowedUsernames != null) {
-                if (!allowedUsernames.containsKey(username)) {
+            if (authorizedUsernames != null && !authorizedUsernames.isEmpty()) {
+                if (!authorizedUsernames.containsKey(username)) {
                     throw new UnauthorizedException("User '" + username + "' no allowed to login.");
                 }
             }

src/web/server-props.jsp

@@ -76,7 +76,7 @@
         if (errors.size() == 0) {
             server.getServerInfo().setName(serverName);
             JiveGlobals.setProperty("xmpp.socket.plain.port", String.valueOf(port));
-            JiveGlobals.setProperty("embedded-web.port", String.valueOf(embeddedPort));
+            JiveGlobals.setProperty("adminConsole.port", String.valueOf(embeddedPort));
             JiveGlobals.setProperty("xmpp.socket.ssl.active", String.valueOf(sslEnabled));
             JiveGlobals.setProperty("xmpp.socket.ssl.port", String.valueOf(sslPort));
             response.sendRedirect("server-props.jsp?success=true");
@@ -88,7 +88,7 @@
         serverName = server.getServerInfo().getName();
         sslEnabled = "true".equals(JiveGlobals.getProperty("xmpp.socket.ssl.active"));
         try { port = Integer.parseInt(JiveGlobals.getProperty("xmpp.socket.plain.port")); } catch (Exception ignored) {}
-        try { embeddedPort = Integer.parseInt(JiveGlobals.getProperty("embedded-web.port")); } catch (Exception ignored) {}
+        try { embeddedPort = Integer.parseInt(JiveGlobals.getProperty("adminConsole.port")); } catch (Exception ignored) {}
         try { sslPort = Integer.parseInt(JiveGlobals.getProperty("xmpp.socket.ssl.port")); } catch (Exception ignored) {}
     }
 %>

src/web/setup-host-settings.jsp

@@ -36,7 +36,7 @@
             Map xmppSettings = new HashMap();
 
             xmppSettings.put("xmpp.domain",domain);
-            xmppSettings.put("embedded-web.port",Integer.toString(embeddedPort));
+            xmppSettings.put("adminConsole.port",Integer.toString(embeddedPort));
             xmppSettings.put("xmpp.socket.ssl.active",""+sslEnabled);
             xmppSettings.put("xmpp.auth.anonymous", "true" );
             session.setAttribute("xmppSettings", xmppSettings);
@@ -54,7 +54,7 @@
     // Load the current values:
     if (!doContinue) {
         domain = JiveGlobals.getProperty("xmpp.domain");
-        embeddedPort = JiveGlobals.getIntProperty("embedded-web.port", 9090);
+        embeddedPort = JiveGlobals.getIntProperty("adminConsole.port", 9090);
         sslEnabled = JiveGlobals.getBooleanProperty("xmpp.socket.ssl.active", true);
 
         // If the domain is still blank, guess at the value: