Merge concerns - Adrien

diff --cc CMakeLists.txt
index c6e0b7c,f2d0163..7c442ce
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -88,8 -88,8 +88,10 @@@ set(JMSG_C_SR
        src/jmsg_task.h
        src/jmsg_synchro.c
        src/jmsg_synchro.h
 +      src/jtrace.c
 +      src/jtrace.h
+       src/jmsg_rngstream.c
+       src/jmsg_rngstream.h
  )
  
  set(JMSG_JAVA_SRC
@@@ -109,7 -109,7 +111,8 @@@
        org/simgrid/msg/TransferFailureException.java   
        org/simgrid/msg/Mutex.java
        org/simgrid/msg/Comm.java
 +      org/simgrid/trace/Trace.java
+       org/simgrid/msg/RngStream.java
  )
  
  set(JAVA_EXAMPLES
@@@ -180,7 -183,7 +190,8 @@@ set(XML_FILE
      examples/master_slave_bypass/platform.xml
      examples/master_slave_kill/platform.xml
      examples/async/asyncDeployment.xml
 +    examples/tracing/tracingPingPongDeployment.xml
+     examples/bittorrent/bittorrent.xml
  )
  
  set(source_to_pack
@@@ -276,7 -264,8 +288,8 @@@ add_custom_command
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java                                 
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
        COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/*.java
 -
 +      COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
+       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java
  )
  
  add_custom_target(simgrid_java_examples ALL
@@@ -306,10 -297,9 +321,10 @@@ ADD_TEST(CommTime        ${TESH_BIN_PAT
  ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
  ADD_TEST(bypass          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh)
  ADD_TEST(kill            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)
 -ADD_TEST(startKillTime            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
 +ADD_TEST(startKillTime   ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
 +ADD_TEST(tracing         ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPong.tesh)
  #Don't forget to put new test in this list!!!
- set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKillTime tracing)
 -set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime)
++set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime tracing)
  
  ##########################################
  # Set the  DYLD_LIBRARY_PATH for mac     #