corrections to the last commit after testing with the console

src/include/META-INF/persistence.xml

@@ -26,6 +26,11 @@
     <class>org.onesocialweb.openfire.model.vcard4.PersistentGenderField</class>
     <class>org.onesocialweb.openfire.model.vcard4.PersistentNoteField</class>
     <class>org.onesocialweb.openfire.model.vcard4.PersistentPhotoField</class>
+    <class>org.onesocialweb.openfire.model.vcard4.PersistentNameField</class>
+    <class>org.onesocialweb.openfire.model.vcard4.PersistentUrlField</class>
+    <class>org.onesocialweb.openfire.model.vcard4.PersistentTelField</class>
+    <class>org.onesocialweb.openfire.model.vcard4.PersistentTimeZoneField</class>
+    <class>org.onesocialweb.openfire.model.vcard4.PersistentEmailField</class>
     <class>org.onesocialweb.openfire.model.vcard4.PersistentProfile</class>            
   </persistence-unit>
 </persistence>

src/java/org/onesocialweb/openfire/model/vcard4/PersistentEmailField.java

@@ -0,0 +1,80 @@
+package org.onesocialweb.openfire.model.vcard4;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+
+import org.onesocialweb.model.acl.AclRule;
+import org.onesocialweb.model.vcard4.EmailField;
+import org.onesocialweb.openfire.model.acl.PersistentAclRule;
+
+@Entity(name="EmailField")
+public class PersistentEmailField extends EmailField {
+
+	@OneToMany(cascade=CascadeType.ALL, targetEntity=PersistentAclRule.class, fetch=FetchType.EAGER)
+	private List<AclRule> rules = new ArrayList<AclRule>();
+
+	@Enumerated(EnumType.ORDINAL)
+	private EmailField.Type type = EmailField.Type.Home;
+
+	@Basic
+	private String email;
+
+	@Override
+	public String getEmail() {
+		return this.email;
+	}
+
+	@Override
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	@Override
+	public void setEmail(String email, Type type) {
+		this.email = email;
+		this.type= type;
+	}
+
+	@Override
+	public Type getType(){
+		return this.type;
+	}
+
+	@Override
+	public void addAclRule(AclRule rule) {
+		rules.add(rule);
+	}
+
+	@Override
+	public List<AclRule> getAclRules() {
+		return Collections.unmodifiableList(rules);
+	}
+
+	@Override
+	public void removeAclRule(AclRule rule) {
+		rules.remove(rule);
+	}
+
+	@Override
+	public void setAclRules(List<AclRule> rules) {
+		this.rules = rules;
+	}
+
+	@Override
+	public boolean hasAclRules() {
+		if (rules != null && rules.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+
+}

src/java/org/onesocialweb/openfire/model/vcard4/PersistentNameField.java

@@ -0,0 +1,104 @@
+package org.onesocialweb.openfire.model.vcard4;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+
+import org.onesocialweb.model.acl.AclRule;
+import org.onesocialweb.model.vcard4.NameField;
+import org.onesocialweb.openfire.model.acl.PersistentAclRule;
+
+@Entity(name="NameField")
+public class PersistentNameField extends NameField
+{
+
+	@OneToMany(cascade=CascadeType.ALL, targetEntity=PersistentAclRule.class, fetch=FetchType.EAGER)
+	private List<AclRule> rules = new ArrayList<AclRule>();	
+
+	@Basic
+	private String surname;
+
+	@Basic
+	private String given;
+
+	@Basic
+	private String suffix;
+
+	@Basic
+	private String prefix;
+
+	@Override
+	public String getSurname() {
+		return surname;
+	}
+
+	@Override
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
+
+	@Override
+	public String getGiven() {
+		return given;
+	}
+
+	@Override
+	public void setGiven(String given) {
+		this.given = given;
+	}
+
+	@Override
+	public String getSuffix() {
+		return suffix;
+	}
+
+	@Override
+	public void setSuffix(String suffix) {
+		this.suffix = suffix;
+	}
+
+	@Override
+	public String getPrefix() {
+		return prefix;
+	}
+
+	@Override
+	public void setPrefix(String preffix) {
+		this.prefix = preffix;
+	}
+
+
+	@Override
+	public void addAclRule(AclRule rule) {
+		rules.add(rule);
+	}
+
+	@Override
+	public List<AclRule> getAclRules() {
+		return Collections.unmodifiableList(rules);
+	}
+
+	@Override
+	public void removeAclRule(AclRule rule) {
+		rules.remove(rule);
+	}
+
+	@Override
+	public void setAclRules(List<AclRule> rules) {
+		this.rules = rules;
+	}
+
+	@Override
+	public boolean hasAclRules() {
+		if (rules != null && rules.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+}