Author: vdichev
Date: Mon Apr 6 20:18:33 2009
New Revision: 762492
URL: http://svn.apache.org/viewvc?rev=762492&view=rev
Log:
Make Permission a MappedEnum.
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Privilege.scala
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=762492&r1=762491&r2=762492&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/api/RestAPI.scala
Mon Apr 6 20:18:33 2009
@@ -347,7 +347,7 @@
val r: Box[Boolean] =
for (user <- User.currentUser;
pool = AccessPool.create.name(poolName).saveMe;
- privilegeSaved =
Privilege.create.pool(pool).user(user).permission(Privilege.Admin.toStr).save
+ privilegeSaved =
Privilege.create.pool(pool).user(user).permission(Permission.Admin).save
) yield privilegeSaved
r
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Privilege.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Privilege.scala?rev=762492&r1=762491&r2=762492&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Privilege.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/model/Privilege.scala
Mon Apr 6 20:18:33 2009
@@ -36,16 +36,13 @@
object id extends MappedLongIndex(this)
object pool extends MappedLongForeignKey(this, AccessPool)
object user extends MappedLongForeignKey(this, User)
- object permission extends MappedString(this, 256) with Permission
+ object permission extends MappedEnum(this, Permission)
- sealed trait Permission
- case object Read extends Permission {
- def toStr = "Read"
- }
- case object Write extends Permission {
- def toStr = "Write"
- }
- case object Admin extends Permission {
- def toStr = "Admin"
- }
}
+
+object Permission extends Enumeration {
+ val Read = Value(0, "Read")
+ val Write = Value(1, "Write")
+ val Admin = Value(2, "Admin")
+}
+
