epichub

diff --git a/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java b/cis-modules/cis-management/cis-manager/cis-manager/src
index 86ff598..a0043f1 100644
--- a/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java
+++ b/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java
@@ -181,8 +181,8 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                System.out.println("in setup! cisManagerUnderTest.getSessionFactory(): "+sessionFactory);
                //ActivityFeed.setStaticSessionFactory(sessionFactory);
                //cisManagerUnderTest.setSessionFactory(sessionFactory);
-               cisManagerUnderTest.setSessionFactory(sessionFactory);
-               Mockito.when(ActivityFeed.startUp(anyString())).thenReturn(new ActivityFeed());

epichub

  </iq> 
[2012-05-22 15:35:10.859] INFO  pool-53-thread-3             org.societies.comm.xmpp.xc.impl.CommManagerHelper                 iq.getFrom().toString()[email protected]/bjornmagnusmbp 
[2012-05-22 15:35:10.860] INFO  pool-53-thread-3             org.societies.cis.manager.CisManager                              get Query received 
[2012-05-22 15:35:10.861] INFO  pool-53-thread-3             org.societies.cis.manager.CisManager                              create received 
[2012-05-22 15:35:10.861] INFO  pool-53-thread-3             org.societies.cis.manager.CisManager                              sender JID = [email protected] 
[2012-05-22 15:35:10.861] INFO  pool-53-thread-3             org.societies.cis.manager.Cis                                     CIS editor created 
[2012-05-22 15:35:10.861] INFO  pool-53-thread-3             org.societies.comm.xmpp.xc.impl.XCCommunicationMgr                Connecting... 
[2012-05-22 15:35:15.873] INFO  pool-53-thread-3             org.societies.comm.xmp

epichub

org.societies:activityfeed:bundle:0.1-SNAPSHOT
[INFO] +- org.springframework:org.springframework.spring-library:libd:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.aop:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.asm:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.beans:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.context:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.context.support:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.core:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.jdbc:jar:3.0.5.RELEASE:provided
[INFO] |  +- org.springframework:org.springframework.jms:jar:3.0.5.RELEASE:provided

epichub

section: screens
	epicmbp:
		halfDuplexCapsLock = false
		halfDuplexNumLock = false
		halfDuplexScrollLock = false
		xtestIsXineramaUnaware = false
		switchCorners = none 
		switchCornerSize = 0
	imac:
		halfDuplexCapsLock = false

epichub

➜  ~  cat ~/local/bin/hack.sh 
#!/bin/sh -x
# hack: Merge the latest changes from the master branch into your current branch
ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0
CURRENT="${ref#refs/heads/}"
git checkout master
git pull origin master
git checkout ${CURRENT}
git rebase master%  

epichub

INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] ------------------------------------------------------------------------
[INFO] MPOWER parent ......................................... SUCCESS [1.340s]
[INFO] MPOWER-AccessDoorControlManagement-Parent ............. SUCCESS [0.007s]
[INFO] MPOWER-AccessDoorControlManagement-WS ................. SUCCESS [7.427s]
[INFO] MPOWER-Security-Parent ................................ SUCCESS [0.010s]
[INFO] MPOWER-Security-WS .................................... SUCCESS [2.637s]
[INFO] MPOWER-hibernate ...................................... SUCCESS [5.024s]
[INFO] MPOWER-AccessDoorControlManagement-Lib ................ SUCCESS [1.312s]

epichub

--->  Computing dependencies for rxvt-unicode.
--->  Building rxvt-unicode
/usr/bin/gcc-4.2 -L/opt/local/lib -arch x86_64 -o rxvt rxvt.o background.o command.o rxvtfont.o init.o logging.o main.o misc.o ptytty.o proxy.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o rxvttoolkit.o rxvtutil.o keyboard.o fdpass.o ev_cpp.o rxvtperl.o -lm  -lsupc++ -L/opt/local/lib -lXft -lXrender -lfontconfig -lexpat -liconv -lfreetype -lz -lX11 -lXau -lXdmcp    -L/opt/local/lib -R/opt/local/lib  -lX11    -L/opt/local/lib -arch x86_64 -arch i386 -fstack-protector  -L/opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level/CORE -lperl -ldl -lm -lutil -lc
/usr/bin/gcc-4.2 -L/opt/local/lib -arch x86_64 -o rxvtd rxvtd.o background.o command.o rxvtfont.o init.o logging.o main.o misc.o ptytty.o proxy.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o rxvttoolkit.o rxvtutil.o keyboard.o fdpass.o ev_cpp.o rxvtp