git-svn-id: http://svn.cacert.cl/Software/BirdShack@8 d4452222-2f33-11de-9270-010000000000

34 files changed, 947 insertions, 0 deletions

diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Application.class b/Business Logic/trunk/src/org/cacert/bl/model/Application.class
new file mode 100644
index 0000000..cf0224d
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Application.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Application.java b/Business Logic/trunk/src/org/cacert/bl/model/Application.java
new file mode 100644
index 0000000..c707645
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Application.java
@@ -0,0 +1,28 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Application extends AssurableEntity {
+	String desc;
+
+	/**
+	 * @return the desc
+	 */
+	public String getDesc() {
+		return desc;
+	}
+
+	/**
+	 * @param desc the desc to set
+	 */
+	protected Application setDesc(String desc) {
+		this.desc = desc;
+		return this;
+	}
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.class b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.class
new file mode 100644
index 0000000..6341002
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.java b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.java
new file mode 100644
index 0000000..d628c59
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntity.java
@@ -0,0 +1,37 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ *
+ */
+public abstract class AssurableEntity extends CacertObject {
+	private String name;
+	public AssurableEntity() {
+		super();
+	}
+	
+	public static List<AssurableEntity> list() {
+		return null;
+	}
+	
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name the name to set
+	 */
+	protected AssurableEntity setName(String name) {
+		this.name = name;
+		return this;
+	}
+	
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.class b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.class
new file mode 100644
index 0000000..1bf59f8
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.java b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.java
new file mode 100644
index 0000000..c43d08b
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/AssurableEntityVerifiable.java
@@ -0,0 +1,27 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public abstract class AssurableEntityVerifiable extends AssurableEntity {
+	private String status;
+
+	/**
+	 * @return the status
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * @param status the status to set
+	 */
+	public AssurableEntityVerifiable setStatus(String status) {
+		this.status = status;
+		return this;
+	}
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Assurance.class b/Business Logic/trunk/src/org/cacert/bl/model/Assurance.class
new file mode 100644
index 0000000..398daa1
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Assurance.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Assurance.java b/Business Logic/trunk/src/org/cacert/bl/model/Assurance.java
new file mode 100644
index 0000000..ace121c
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Assurance.java
@@ -0,0 +1,125 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ *
+ */
+public class Assurance extends CacertObject {
+	private int assurancePoints;
+	private int experiencePoints;
+	private String date;
+	private String location;
+	private Member from;
+	private Member to;
+	
+	public static List<Assurance> list() {
+		return null;
+	}
+	
+	/**
+	 * 
+	 */
+	public Assurance() {
+		// TODO Auto-generated constructor stub
+	}
+	
+	protected Assurance revoke() {
+		return this;
+	}
+
+	/**
+	 * @return the assurancePoints
+	 */
+	public int getAssurancePoints() {
+		return assurancePoints;
+	}
+
+	/**
+	 * @param assurancePoints the assurancePoints to set
+	 */
+	protected Assurance setAssurancePoints(int assurancePoints) {
+		this.assurancePoints = assurancePoints;
+		return this;
+	}
+
+	/**
+	 * @return the experiencePoints
+	 */
+	public int getExperiencePoints() {
+		return experiencePoints;
+	}
+
+	/**
+	 * @param experiencePoints the experiencePoints to set
+	 */
+	protected Assurance setExperiencePoints(int experiencePoints) {
+		this.experiencePoints = experiencePoints;
+		return this;
+	}
+
+	/**
+	 * @return the date
+	 */
+	public String getDate() {
+		return date;
+	}
+
+	/**
+	 * @param date the date to set
+	 */
+	protected Assurance setDate(String date) {
+		this.date = date;
+		return this;
+	}
+
+	/**
+	 * @return the location
+	 */
+	public String getLocation() {
+		return location;
+	}
+
+	/**
+	 * @param location the location to set
+	 */
+	protected Assurance setLocation(String location) {
+		this.location = location;
+		return this;
+	}
+
+	/**
+	 * @return the from
+	 */
+	public Member getFrom() {
+		return from;
+	}
+
+	/**
+	 * @param from the from to set
+	 */
+	protected Assurance setFrom(Member from) {
+		this.from = from;
+		return this;
+	}
+
+	/**
+	 * @return the to
+	 */
+	public Member getTo() {
+		return to;
+	}
+
+	/**
+	 * @param to the to to set
+	 */
+	protected Assurance setTo(Member to) {
+		this.to = to;
+		return this;
+	}
+
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.class b/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.class
new file mode 100644
index 0000000..03fdb20
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.java b/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.java
new file mode 100644
index 0000000..3b0d519
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/CacertObject.java
@@ -0,0 +1,36 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ * Generic Object where all other are derived from
+ */
+public abstract class CacertObject {
+	private String id;
+	
+	/**
+	 * @return the id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id the id to set
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public List<Event> getEvents() {
+		return null;
+	}
+	
+	protected CacertObject addEvent(Event event) {
+		return this;
+	}
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Credential.class b/Business Logic/trunk/src/org/cacert/bl/model/Credential.class
new file mode 100644
index 0000000..6f5f244
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Credential.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Credential.java b/Business Logic/trunk/src/org/cacert/bl/model/Credential.java
new file mode 100644
index 0000000..4405953
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Credential.java
@@ -0,0 +1,51 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Credential extends CacertObject {
+	private String type;
+	private String content;
+	
+	/**
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * @param type the type to set
+	 */
+	protected Credential setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	/**
+	 * @return the content
+	 */
+	public String getContent() {
+		return content;
+	}
+
+	/**
+	 * @param content the content to set
+	 */
+	protected Credential setContent(String content) {
+		this.content = content;
+		return this;
+	}
+
+	/**
+	 * 
+	 */
+	public Credential() {
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Delegation.class b/Business Logic/trunk/src/org/cacert/bl/model/Delegation.class
new file mode 100644
index 0000000..7b67292
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Delegation.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Delegation.java b/Business Logic/trunk/src/org/cacert/bl/model/Delegation.java
new file mode 100644
index 0000000..f005247
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Delegation.java
@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Delegation extends CacertObject {
+	private String comment;
+	private boolean revoked;
+	/**
+	 * @return the comment
+	 */
+	public String getComment() {
+		return comment;
+	}
+	/**
+	 * @param comment the comment to set
+	 */
+	protected Delegation setComment(String comment) {
+		this.comment = comment;
+		return this;
+	}
+	/**
+	 * @return the revoked
+	 */
+	public boolean isRevoked() {
+		return revoked;
+	}
+	/**
+	 * @param revoked the revoked to set
+	 */
+	protected Delegation setRevoked(boolean revoked) {
+		this.revoked = revoked;
+		return this;
+	}
+	
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Domain.class b/Business Logic/trunk/src/org/cacert/bl/model/Domain.class
new file mode 100644
index 0000000..4b59215
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Domain.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Domain.java b/Business Logic/trunk/src/org/cacert/bl/model/Domain.java
new file mode 100644
index 0000000..3e974e0
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Domain.java
@@ -0,0 +1,12 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Domain extends AssurableEntityVerifiable {
+
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Email.class b/Business Logic/trunk/src/org/cacert/bl/model/Email.class
new file mode 100644
index 0000000..c254fbc
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Email.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Email.java b/Business Logic/trunk/src/org/cacert/bl/model/Email.java
new file mode 100644
index 0000000..5f64de0
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Email.java
@@ -0,0 +1,12 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Email extends AssurableEntityVerifiable {
+
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Event.class b/Business Logic/trunk/src/org/cacert/bl/model/Event.class
new file mode 100644
index 0000000..d93acdd
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Event.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Event.java b/Business Logic/trunk/src/org/cacert/bl/model/Event.java
new file mode 100644
index 0000000..66cdd71
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Event.java
@@ -0,0 +1,69 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Event extends CacertObject {
+	private String type;
+	private String reference;
+	private String date;
+	private String desc;
+	/**
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	/**
+	 * @param type the type to set
+	 */
+	protected Event setType(String type) {
+		this.type = type;
+		return this;
+	}
+	/**
+	 * @return the reference
+	 */
+	public String getReference() {
+		return reference;
+	}
+	/**
+	 * @param reference the reference to set
+	 */
+	protected Event setReference(String reference) {
+		this.reference = reference;
+		return this;
+	}
+	/**
+	 * @return the date
+	 */
+	public String getDate() {
+		return date;
+	}
+	/**
+	 * @param date the date to set
+	 */
+	protected Event setDate(String date) {
+		this.date = date;
+		return this;
+	}
+	/**
+	 * @return the desc
+	 */
+	public String getDesc() {
+		return desc;
+	}
+	/**
+	 * @param desc the desc to set
+	 */
+	protected Event setDesc(String desc) {
+		this.desc = desc;
+		return this;
+	}
+	
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Member.class b/Business Logic/trunk/src/org/cacert/bl/model/Member.class
new file mode 100644
index 0000000..4381daf
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Member.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Member.java b/Business Logic/trunk/src/org/cacert/bl/model/Member.java
new file mode 100644
index 0000000..b93fb5b
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Member.java
@@ -0,0 +1,127 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ * Object for the member
+ */
+public class Member extends CacertObject {
+	private boolean privacy;
+	private boolean terminated;
+	private Email email;
+	
+	public static List<Member> list() {
+		return null;
+	}
+	
+	public Member() {
+		
+	}
+	
+	/**
+	 * @return the privacy
+	 */
+	public boolean isPrivacy() {
+		return privacy;
+	}
+	/**
+	 * @param privacy the privacy to set
+	 */
+	protected Member setPrivacy(boolean privacy) {
+		this.privacy = privacy;
+		return this;
+	}
+	/**
+	 * @return the terminated
+	 */
+	public boolean isTerminated() {
+		return terminated;
+	}
+	/**
+	 * @param terminated the terminated to set
+	 */
+	protected Member setTerminated(boolean terminated) {
+		this.terminated = terminated;
+		return this;
+	}
+	
+	public Email getEmail() {
+		return email;
+	}
+	
+	protected Member setEmail() {
+		return this;
+	}
+	
+	public List<Delegation> getDelegations() {
+		return null;
+	}
+	
+	public List<Assurance> getAssurances() {
+		return null;
+	}
+	
+	public int getAssurancePoints() {
+		return 0;
+	}
+	
+	protected Member addAssurance(Assurance assurance) {
+		return this;
+	}
+	
+	public List<Profile> getProfiles() {
+		return null;	
+	}
+	
+	public List<Token> getReceivedTokens() {
+		return null;
+	}
+	
+	public List<Token> getIssuedTokens() {
+		return null;
+	}
+	
+	public List<Application> getApplications() {
+		return null;
+	}
+	
+	public List<Role> getRoles() {
+		return null;
+	}
+	
+	protected Member addRole(Role role) {
+		return this;
+	}
+	
+	public List<Credential> getCredentials() {
+		return null;
+	}
+	
+	protected Member addCredential(Credential credential) {
+		return null;
+	}
+	
+	public List<Notification> getNotifications() {
+		return null;
+	}
+	
+	protected Member addNotification(Notification notification) {
+		return null;
+	}
+	
+	public List<Token> getTokens() {
+		return null;
+	}
+	
+	protected Member addToken(Token token) {
+		return null;
+	}
+	
+	protected Member delete() {
+		return null;
+	}
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Name.class b/Business Logic/trunk/src/org/cacert/bl/model/Name.class
new file mode 100644
index 0000000..47d08ae
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Name.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Name.java b/Business Logic/trunk/src/org/cacert/bl/model/Name.java
new file mode 100644
index 0000000..308d6df
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Name.java
@@ -0,0 +1,28 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Name extends AssurableEntity {
+	String type;
+
+	/**
+	 * @return the desc
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * @param desc the desc to set
+	 */
+	protected Name setType(String desc) {
+		this.type = desc;
+		return this;
+	}
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Notification.class b/Business Logic/trunk/src/org/cacert/bl/model/Notification.class
new file mode 100644
index 0000000..125e475
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Notification.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Notification.java b/Business Logic/trunk/src/org/cacert/bl/model/Notification.java
new file mode 100644
index 0000000..2924a97
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Notification.java
@@ -0,0 +1,115 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Notification extends CacertObject {
+	private Member from;
+	private Member to;
+	private String content;
+	private String created;
+	private String confirmed;
+	private String type;
+	
+	/**
+	 * 
+	 */
+	public Notification() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @return the from
+	 */
+	public Member getFrom() {
+		return from;
+	}
+
+	/**
+	 * @param from the from to set
+	 */
+	protected Notification setFrom(Member from) {
+		this.from = from;
+		return this;
+	}
+
+	/**
+	 * @return the to
+	 */
+	public Member getTo() {
+		return to;
+	}
+
+	/**
+	 * @param to the to to set
+	 */
+	protected Notification setTo(Member to) {
+		this.to = to;
+		return this;
+	}
+
+	/**
+	 * @return the content
+	 */
+	public String getContent() {
+		return content;
+	}
+
+	/**
+	 * @param content the content to set
+	 */
+	protected Notification setContent(String content) {
+		this.content = content;
+		return this;
+	}
+
+	/**
+	 * @return the created
+	 */
+	public String getCreated() {
+		return created;
+	}
+
+	/**
+	 * @param created the created to set
+	 */
+	protected Notification setCreated(String created) {
+		this.created = created;
+		return this;
+	}
+
+	/**
+	 * @return the confirmed
+	 */
+	public String getConfirmed() {
+		return confirmed;
+	}
+
+	/**
+	 * @param confirmed the confirmed to set
+	 */
+	protected Notification setConfirmed(String confirmed) {
+		this.confirmed = confirmed;
+		return this;
+	}
+
+	/**
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * @param type the type to set
+	 */
+	protected Notification setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Permission.class b/Business Logic/trunk/src/org/cacert/bl/model/Permission.class
new file mode 100644
index 0000000..2332827
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Permission.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Permission.java b/Business Logic/trunk/src/org/cacert/bl/model/Permission.java
new file mode 100644
index 0000000..ab15d21
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Permission.java
@@ -0,0 +1,43 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ *
+ */
+public class Permission extends CacertObject {
+	private String recourcePattern;
+	private List<String> actions;
+	/**
+	 * @return the recourcePattern
+	 */
+	public String getRecourcePattern() {
+		return recourcePattern;
+	}
+	/**
+	 * @param recourcePattern the recourcePattern to set
+	 */
+	protected Permission setRecourcePattern(String recourcePattern) {
+		this.recourcePattern = recourcePattern;
+		return this;
+	}
+	/**
+	 * @return the actions
+	 */
+	public List<String> getActions() {
+		return actions;
+	}
+	/**
+	 * @param actions the actions to set
+	 */
+	protected Permission setActions(List<String> actions) {
+		this.actions = actions;
+		return this;
+	}
+	
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Profile.class b/Business Logic/trunk/src/org/cacert/bl/model/Profile.class
new file mode 100644
index 0000000..e5774f8
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Profile.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Profile.java b/Business Logic/trunk/src/org/cacert/bl/model/Profile.java
new file mode 100644
index 0000000..9dd8bdc
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Profile.java
@@ -0,0 +1,67 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+import com.sun.tools.javac.util.List;
+
+/**
+ * @author law
+ *
+ */
+public class Profile extends CacertObject {
+	private String dob;
+	
+	public static List<Profile> list() {
+		return null;
+	}
+	
+	public Profile() {
+		
+	}
+	
+	public List<Email> getEmails() {
+		return null;
+	}
+	
+	protected Profile addEmail(Email email) {
+		return this;
+	}
+	
+	public List<Credential> getCredentials() {
+		return null;
+	}
+	
+	protected Profile addCredential(Credential credential) {
+		return this;
+	}
+	
+	public List<Delegation> getDelegations() {
+		return null;
+	}
+	
+	protected Profile addDelegation(Delegation delegation) {
+		return this;
+	}
+	
+	public String getDob() {
+		return dob;
+	}
+	
+	protected Profile setDob(String dob) {
+		this.dob = dob;
+		return this;
+	}
+	
+	public List<Name> getNames() {
+		return null;
+	}
+	
+	protected Profile addName(Name name) {
+		return this;
+	}
+	
+	protected Profile delete() {
+		return this;
+	}
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Role.class b/Business Logic/trunk/src/org/cacert/bl/model/Role.class
new file mode 100644
index 0000000..c02d6be
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Role.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Role.java b/Business Logic/trunk/src/org/cacert/bl/model/Role.java
new file mode 100644
index 0000000..194852c
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Role.java
@@ -0,0 +1,29 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Role {
+	String name;
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	protected Role setName(String name) {
+		this.name = name;
+		return this;
+	}
+	
+	
+}
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Token.class b/Business Logic/trunk/src/org/cacert/bl/model/Token.class
new file mode 100644
index 0000000..6370859
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Token.class
diff --git a/Business Logic/trunk/src/org/cacert/bl/model/Token.java b/Business Logic/trunk/src/org/cacert/bl/model/Token.java
new file mode 100644
index 0000000..da01e02
--- /dev/null
+++ b/Business Logic/trunk/src/org/cacert/bl/model/Token.java
@@ -0,0 +1,100 @@
+/**
+ * 
+ */
+package org.cacert.bl.model;
+
+/**
+ * @author law
+ *
+ */
+public class Token extends CacertObject {
+	private String token;
+	private String created;
+	private String expired;
+	private boolean revoked;
+	private String desc;
+	
+	/**
+	 * 
+	 */
+	public Token() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @return the token
+	 */
+	public String getToken() {
+		return token;
+	}
+
+	/**
+	 * @param token the token to set
+	 */
+	protected Token setToken(String token) {
+		this.token = token;
+		return this;
+	}
+
+	/**
+	 * @return the created
+	 */
+	public String getCreated() {
+		return created;
+	}
+
+	/**
+	 * @param created the created to set
+	 */
+	protected Token setCreated(String created) {
+		this.created = created;
+		return this;
+	}
+
+	/**
+	 * @return the expired
+	 */
+	public String getExpired() {
+		return expired;
+	}
+
+	/**
+	 * @param expired the expired to set
+	 */
+	protected Token setExpired(String expired) {
+		this.expired = expired;
+		return this;
+	}
+
+	/**
+	 * @return the revoked
+	 */
+	public boolean isRevoked() {
+		return revoked;
+	}
+
+	/**
+	 * @param revoked the revoked to set
+	 */
+	protected Token setRevoked(boolean revoked) {
+		this.revoked = revoked;
+		return this;
+	}
+
+	/**
+	 * @return the desc
+	 */
+	public String getDesc() {
+		return desc;
+	}
+
+	/**
+	 * @param desc the desc to set
+	 */
+	protected Token setDesc(String desc) {
+		this.desc = desc;
+		return this;
+	}
+	
+	
+}