incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r822608 - in /incubator/esme/trunk/server/src/main/scala: bootstrap/liftweb/Boot.scala org/apache/esme/actor/Distributor.scala org/apache/esme/actor/GroupActor.scala org/apache/esme/model/Group.scala org/apache/esme/model/Message.scala
Date Wed, 07 Oct 2009 07:17:42 GMT
Author: rhirsch
Date: Wed Oct  7 07:17:42 2009
New Revision: 822608

URL: http://svn.apache.org/viewvc?rev=822608&view=rev
Log:
[ESME-99] Remove old Files dealing with Groups

Removed:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/GroupActor.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Group.scala
Modified:
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=822608&r1=822607&r2=822608&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Wed Oct  7 07:17:42
2009
@@ -64,7 +64,7 @@
     if (Props.mode == Props.RunModes.Test) {
       Schemifier.destroyTables_!!(Log.infoF _, User, ExtSession,
                                   Message, Mailbox, Tag,
-                                  Group, Relationship, MessageTag,
+                                  Relationship, MessageTag,
                                   AuthToken, UrlStore, Tracking,
                                   Action, DidPerform, AccessPool,
                                   Privilege, UserAuth, UserCryptoSig)
@@ -72,7 +72,7 @@
 
     Schemifier.schemify(true, Log.infoF _, User, ExtSession, Message,
                         Mailbox, Tag,
-                        Group, Relationship, MessageTag, AuthToken,
+                        Relationship, MessageTag, AuthToken,
                         UrlStore, Tracking, Action, DidPerform,
                         AccessPool, Privilege, UserAuth, UserCryptoSig)
 

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala?rev=822608&r1=822607&r2=822608&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala Wed
Oct  7 07:17:42 2009
@@ -49,7 +49,6 @@
       case StartMeUp =>
         link(ActorWatcher)
         User.findAll.map(_.id.is).foreach(findOrCreateUser)
-        Group.findAll.map(_.id.is).foreach(findOrCreateGroup)
 
       case UserCreatedMessage(user, text, tags, when, 
                               metaData,
@@ -133,7 +132,6 @@
   }
 
   private var users: Map[Long, UserActor] = Map.empty
-  private var groups: Map[Long, GroupActor] = Map.empty
   private var listeners: List[Actor] = Nil
 
   private def findOrCreateUser(user: Long): UserActor = {
@@ -148,15 +146,4 @@
     }
   }
 
-  private def findOrCreateGroup(group: Long) {
-    groups.get(group) match {
-      case Some(ret) => ret
-      case _ =>
-        val ret = new GroupActor
-        ret.start
-        ret ! GroupActor.StartMeUp(group)
-        groups = groups + (group -> ret)
-        ret
-    }
-  }
 }

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=822608&r1=822607&r2=822608&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Wed Oct
 7 07:17:42 2009
@@ -197,7 +197,6 @@
       List("author" -> (obj.map(_.asJs) openOr JE.JsNull))
   }
 
-  object viaGroup extends MappedLongForeignKey(this, Group)
 
   private[model] object text extends MappedText(this){
     import scala.xml.transform.{RuleTransformer, RewriteRule}



Mime
View raw message