Updated Admin.iml for compatibility with Intellij 6.0.2

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

Admin.iml

@@ -10,6 +10,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Wildfire" exported="" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/web/WEB-INF/lib/dwr.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -177,6 +186,11 @@
       <attribute name="URI" value="/WEB-INF/lib/standard.jar" />
       <url>jar://$MODULE_DIR$/build/lib/merge/standard.jar!/</url>
     </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="0" />
+      <attribute name="URI" value="/WEB-INF/lib/stringprep.jar" />
+      <url>jar://$MODULE_DIR$/build/lib/merge/stringprep.jar!/</url>
+    </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/lib/whack.jar" />
@@ -197,6 +211,11 @@
       <attribute name="URI" value="/WEB-INF/classes" />
       <url>file://$MODULE_DIR$/src/resources/jar</url>
     </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
+      <url>jar://$MODULE_DIR$/src/web/WEB-INF/lib/dwr.jar!/</url>
+    </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="0" />
       <attribute name="URI" value="/WEB-INF/classes" />

src/java/org/jivesoftware/wildfire/HttpServerManager.java

@@ -510,12 +510,13 @@ public class HttpServerManager {
         int adminPort = JiveGlobals.getXMLProperty(ADMIN_CONSOLE_PORT, ADMIN_CONSOLE_PORT_DEFAULT);
         int adminSecurePort = JiveGlobals.getXMLProperty(ADMIN_CONOSLE_SECURE_PORT,
                 ADMIN_CONSOLE_SECURE_PORT_DEFAULT);
+        // Check to see if any of the ports are the same.
         if (checkPorts(new int[]{unsecurePort, securePort},
                 new int[]{adminPort, adminSecurePort}))
         {
             if (unsecurePort != adminPort || securePort != adminSecurePort) {
                 Log.warn("HTTP bind ports must be either the same or distinct from admin console" +
-                        " ports, http binding will run on the admin console ports.");
+                        " ports, HTTP binding will run on the admin console ports.");
             }
             if (httpBindServer == adminServer) {
                 return;

src/java/org/jivesoftware/wildfire/http/HttpSessionManager.java

@@ -114,7 +114,7 @@ public class HttpSessionManager {
     }
 
     /**
-     * Creates an HTTP binding session which will allow a user to exchnage packets with Wildfire.
+     * Creates an HTTP binding session which will allow a user to exchange packets with Wildfire.
      *
      * @param address the internet address that was used to bind to Wildfie.
      * @param rootNode the body element that was sent containing the request for a new session.