[JM-65] Added check for valid JID on add.

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

build/projects/Admin.iml

@@ -21,6 +21,10 @@
     </orderEntry>
     <orderEntryProperties />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
   <component name="WebModuleBuildComponent">
     <setting name="EXPLODED_URL" value="file://" />
     <setting name="EXPLODED_ENABLED" value="false" />

build/projects/Openfire.iml

@@ -455,5 +455,9 @@
     </orderEntry>
     <orderEntryProperties />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
 </module>
 

build/projects/Plugins.iml

@@ -161,5 +161,9 @@
     </orderEntry>
     <orderEntryProperties />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
 </module>
 

src/i18n/openfire_i18n_en.properties

@@ -218,6 +218,7 @@
 ##      Added key: 'user.roster.add.add_another'
 ##      Added key: 'user.roster.add.required'
 ##      Added key: 'user.roster.item.settings'
+##      Added key: 'user.roster.add.illegal_jid'
 
 
 # Openfire
@@ -1934,6 +1935,7 @@ user.roster.add.info=Use the form below to add a new roster item for user {0}.
 user.roster.add.error_adding_item=Error adding roster item.  Please check your server logs.
 user.roster.add.item_exists=Roster item of the same JID already exists.
 user.roster.add.uneditable_group=Attempted to remove item from a group that is not editable.  (probably a shared group)
+user.roster.add.illegal_jid=JID was not of a valid format.
 user.roster.add.success=Successfully added roster item.
 user.roster.add.new_item=Add New Roster Item
 user.roster.add.add=Add Item

src/test/throttletest/ThrottleTest.iml

@@ -29,5 +29,9 @@
     </orderEntry>
     <orderEntryProperties />
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
 </module>
 

src/web/user-roster-add.jsp

@@ -74,6 +74,9 @@
             catch (SharedGroupException e) {
                 errors.put("uneditableGroup","");
             }
+            catch (IllegalArgumentException e) {
+                errors.put("illegalJID","");
+            }
             catch (Exception e) {
                 errors.put("general","");
                 Log.error(e);
@@ -114,6 +117,8 @@
                 <fmt:message key="user.roster.add.item_exists" />
             <% } else if (errors.get("uneditableGroup") != null) { %>
                 <fmt:message key="user.roster.add.uneditable_group" />
+            <% } else if (errors.get("illegalJID") != null) { %>
+                <fmt:message key="user.roster.add.illegal_jid" />
             <% } %>
             </td>
         </tr>