This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The Saros Eclipse Plugin". Pusher was dpp-gerrit.

The branch, master has been updated
       via  e7c234d50796d97f6b7ca3c0ac00ea6dfbb00ea7 (commit)
      from  81a2041359d6a1ff728d5f26fbb341d4293b7632 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7c234d50796d97f6b7ca3c0ac00ea6dfbb00ea7
Author: Franz Zieris <[email protected]>
Date:   Fri Nov 14 15:04:43 2014 +0100

    Revert '[BUILD] Merge branch development/actionAwareness into master'
    
    This reverts commit 8b5f4979108de1f2bdc81d77e650507b9c015e97.
    (Side note: This patch was created manually as there is no "revert" for
    merge commits. I verified the accuracy of this patch by comparing it to
    the last commit on the master branch before the merge, i.e. c8b0374. The
    only difference between this patch and c8b0374 were, as expected, the
    changes of commit 81a2041, which was applied after the merge.)
    
    The action log feature seems to interfere heavily with other Saros
    features, resulting in massive STF test case failures.
    
    This might be a performance (and hence, timing issue), since the first
    failing test was "AddMultipleFilesTest" (which creates 1000 small files
    and hence 1000 additional action log entries).
    
    This issue should be resolved on 'development/actionAwareness' and then
    this branch can be reconsidered for merging.
    
    Change-Id: I6be60121abe647a4f4f978e077513ca5e269cf04
    Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2018
    Tested-by: Jenkins CI
    Reviewed-by: Stefan Rossbach <[email protected]>
    Reviewed-by: Franz Zieris <[email protected]>

-----------------------------------------------------------------------

Summary of changes:
 .../dpp/activities/AbstractActivityReceiver.java   |   15 -
 .../inf/dpp/activities/IActivityReceiver.java      |   25 --
 .../inf/dpp/activities/IDEInteractionActivity.java |  111 -----
 .../inf/dpp/activities/RefactoringActivity.java    |   79 ----
 .../inf/dpp/activities/TestRunActivity.java        |  112 ------
 .../extensions/ActivitiesExtension.java            |    9 -
 de.fu_berlin.inf.dpp/META-INF/MANIFEST.MF          |    5 +-
 de.fu_berlin.inf.dpp/credits.txt                   |    1 -
 .../view16/activitylog/activitylog_dialog.gif      |  Bin 349 -> 0 bytes
 .../activitylog/activitylog_filecreation.gif       |  Bin 210 -> 0 bytes
 .../icons/view16/activitylog/activitylog_junit.gif |  Bin 236 -> 0 bytes
 .../icons/view16/activitylog/activitylog_misc.png  |  Bin 603 -> 0 bytes
 .../view16/activitylog/activitylog_refactoring.gif |  Bin 583 -> 0 bytes
 .../icons/view16/activitylog/activitylog_view.gif  |  Bin 368 -> 0 bytes
 de.fu_berlin.inf.dpp/saros.properties              |    2 +-
 .../awareness/AwarenessInformationCollector.java   |  241 +-----------
 .../inf/dpp/awareness/AwarenessUpdateListener.java |   21 -
 .../inf/dpp/awareness/FileActivityManager.java     |   77 ----
 .../awareness/IDEInteractionActivitiesManager.java |  420 --------------------
 .../inf/dpp/awareness/RefactoringManager.java      |  105 -----
 .../inf/dpp/awareness/TestRunManager.java          |  127 ------
 .../inf/dpp/awareness/actions/ActionType.java      |   20 -
 .../awareness/actions/ActionTypeDataHolder.java    |  244 ------------
 .../inf/dpp/preferences/PreferenceConstants.java   |    6 +-
 .../inf/dpp/preferences/PreferenceInitializer.java |    2 -
 .../inf/dpp/project/internal/SarosSession.java     |   45 --
 .../src/de/fu_berlin/inf/dpp/ui/Messages.java      |    8 -
 .../de/fu_berlin/inf/dpp/ui/messages.properties    |    9 +-
 .../inf/dpp/ui/model/session/UserElement.java      |    1 +
 .../ui/preferencePages/AdvancedPreferencePage.java |    7 +-
 .../ui/widgets/activitylog/ActivityLogControl.java |  251 ------------
 .../ui/widgets/activitylog/ActivityLogDisplay.java |  184 ---------
 .../items/ActivityLinePartnerChangeSeparator.java  |   49 ---
 .../widgets/activitylog/items/ActivityLogLine.java |  242 -----------
 .../dpp/ui/widgets/chat/ChatRoomsComposite.java    |  169 ++-------
 .../viewer/session/UserInteractionListener.java    |    1 +
 .../inf/dpp/stf/server/STFController.java          |    2 -
 .../inf/dpp/stf/server/bot/SarosSWTBot.java        |   25 +-
 .../bot/widget/SarosSWTBotActivityLogLine.java     |   44 --
 .../component/view/saros/IActivityLog.java         |   24 --
 .../superbot/component/view/saros/ISarosView.java  |   13 -
 .../component/view/saros/impl/ActivityLog.java     |   49 ---
 .../component/view/saros/impl/SarosView.java       |   12 -
 .../de/fu_berlin/inf/dpp/stf/shared/Constants.java |    1 -
 .../inf/dpp/project/internal/SarosSessionTest.java |    9 +-
 .../dpp/stf/test/activitylog/ActivityLogTest.java  |  259 ------------
 .../inf/dpp/stf/test/activitylog/TestSuite.java    |   11 -
 47 files changed, 47 insertions(+), 2990 deletions(-)
 delete mode 100644 
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/IDEInteractionActivity.java
 delete mode 100644 
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/RefactoringActivity.java
 delete mode 100644 
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/TestRunActivity.java
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_dialog.gif
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_filecreation.gif
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_junit.gif
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_misc.png
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_refactoring.gif
 delete mode 100644 
de.fu_berlin.inf.dpp/icons/view16/activitylog/activitylog_view.gif
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/AwarenessUpdateListener.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/FileActivityManager.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/IDEInteractionActivitiesManager.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/RefactoringManager.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunManager.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/actions/ActionType.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/actions/ActionTypeDataHolder.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/widgets/activitylog/ActivityLogControl.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/widgets/activitylog/ActivityLogDisplay.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/widgets/activitylog/items/ActivityLinePartnerChangeSeparator.java
 delete mode 100644 
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/widgets/activitylog/items/ActivityLogLine.java
 delete mode 100644 
de.fu_berlin.inf.dpp/test/framework/stf/src/de/fu_berlin/inf/dpp/stf/server/bot/widget/SarosSWTBotActivityLogLine.java
 delete mode 100644 
de.fu_berlin.inf.dpp/test/framework/stf/src/de/fu_berlin/inf/dpp/stf/server/rmi/superbot/component/view/saros/IActivityLog.java
 delete mode 100644 
de.fu_berlin.inf.dpp/test/framework/stf/src/de/fu_berlin/inf/dpp/stf/server/rmi/superbot/component/view/saros/impl/ActivityLog.java
 delete mode 100644 
de.fu_berlin.inf.dpp/test/stf/de/fu_berlin/inf/dpp/stf/test/activitylog/ActivityLogTest.java
 delete mode 100644 
de.fu_berlin.inf.dpp/test/stf/de/fu_berlin/inf/dpp/stf/test/activitylog/TestSuite.java


hooks/post-receive
-- 
The Saros Eclipse Plugin

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
Dpp-robot mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-robot

Reply via email to