esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r1049068 - in /incubator/esme/trunk/server/src/main: resources/ESMEBase.properties scala/org/apache/esme/lib/AccessPoolMgr.scala
Date Tue, 14 Dec 2010 12:46:16 GMT
Author: rhirsch
Date: Tue Dec 14 12:46:16 2010
New Revision: 1049068

URL: http://svn.apache.org/viewvc?rev=1049068&view=rev
Log:
[ESME-139] Access-related changes should be logged

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala

Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=1049068&r1=1049067&r2=1049068&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Tue Dec 14 12:46:16
2010
@@ -39,6 +39,7 @@ base_menu_sign_up_error=You can't sign u
 base_pool_menu=My Pools
 base_pool_error_name_short=The pool name is too short. Pool names must have a length of at
least 3 characters!
 base_pool_msg_new_pool=A new pool '%s' has been created.
+base_pool_msg_new_user=A new user with id: '%d' has been added to pool id: '%d' with permission
'%s'.
 base_pool_msg_duplicate_name_pool=A pool with this name '%s' already exists. Please choose
a different one
 base_pool_msg_choose_pool=--choose pool--
 base_pool_err_user_not_found=User not found

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=1049068&r1=1049067&r2=1049068&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Tue
Dec 14 12:46:16 2010
@@ -197,12 +197,14 @@ object AccessPoolMgr {
       ) yield if(Privilege.hasPermission(admin.id.is, p.id.is, Permission.Admin)) {
         val result = try {
           import org.apache.esme.model.Permission
+          logger.info("ACCESS: " + S.?("base_pool_msg_new_user",user.id.is, p.id.is, permission))
           Privilege.create.user(user).pool(p).permission(Permission(permission.toInt)).save
+
         } catch {
           case _: Exception => false
         }
         if (result) {
-        	Distributor ! Distributor.AllowUserInPool(user.id.is, p.id.is)
+        	Distributor ! Distributor.AllowUserInPool(user.id.is, p.id.is)   	
         	DisplayMessage("messages", <b>{S.?("base_pool_msg_permission_set")}</b>,
 3 seconds, 2 seconds)
        }
         result



Mime
View raw message