Porting Gato's 3.5.0 branch changes to trunk.

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

src/java/org/jivesoftware/openfire/clearspace/ClearspaceVCardTranslator.java

@@ -27,7 +27,7 @@ class ClearspaceVCardTranslator {
 
     // Represents the type of action that was performed.
     enum Action {
-        MODIFY, CREATE, UPDATE, DELETE, NO_ACTION
+        MODIFY, CREATE, UPDATE, DELETE, NO_ACTION;
     }
 
     /**
@@ -122,7 +122,7 @@ class ClearspaceVCardTranslator {
      */
     enum VCardField {
         TITLE, ORG_ORGUNIT, ADR_WORK, ADR_HOME, EMAIL_USERID, EMAIL_PREF_USERID, FN,
-        PHOTO_TYPE, PHOTO_BINVAL, URL, TZ, PHONE_HOME, PHONE_WORK, FAX_WORK, MOBILE_WORK, PAGER_WORK
+        PHOTO_TYPE, PHOTO_BINVAL, URL, TZ, PHONE_HOME, PHONE_WORK, FAX_WORK, MOBILE_WORK, PAGER_WORK;
     }
 
     private static ClearspaceVCardTranslator instance = new ClearspaceVCardTranslator();

src/plugins/userCreation/src/java/org/jivesoftware/openfire/plugin/UserCreationPlugin.java

@@ -362,3 +362,4 @@ public class UserCreationPlugin implements Plugin {
 
 }
 
+