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 75cb21417e14ab26077d1748d270a1b1fe0149e0 (commit)
from a00ae06ac174c6937c8d88f082ba5b5373472067 (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 75cb21417e14ab26077d1748d270a1b1fe0149e0
Author: Stefan Rossbach <[email protected]>
Date: Wed Jun 4 16:35:10 2014 +0200
[REFACTOR] moved XMPP network classes to a dedicated package
Most of XMPP related features are now found in the net.xmpp package.
Change-Id: Id4a03aa98d51c77b5570f6ce7803c3a938d97874
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/1607
Tested-by: Jenkins CI
Reviewed-by: Stefan Rossbach <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
de.fu_berlin.inf.dpp.core/META-INF/MANIFEST.MF | 6 +-
.../inf/dpp/communication/chat/AbstractChat.java | 2 +-
.../inf/dpp/communication/chat/ChatElement.java | 2 +-
.../inf/dpp/communication/chat/IChat.java | 2 +-
.../inf/dpp/communication/chat/IChatListener.java | 2 +-
.../dpp/communication/chat/muc/MultiUserChat.java | 2 +-
.../chat/muc/MultiUserChatService.java | 4 +-
.../chat/muc/MultiUserChatStateManager.java | 2 +-
.../communication/chat/single/SingleUserChat.java | 2 +-
.../chat/single/SingleUserChatService.java | 6 +-
.../extensions/ActivitiesExtension.java | 2 +-
.../InvitationParameterExchangeExtension.java | 2 +-
.../UserFinishedProjectNegotiationExtension.java | 2 +-
.../extensions/UserListExtension.java | 2 +-
.../jupiter/internal/JupiterDocumentServer.java | 2 +-
.../management/ConcurrentDocumentServer.java | 2 +-
.../dpp/concurrent/management/JupiterServer.java | 2 +-
.../inf/dpp/editor/colorstorage/ColorIDSet.java | 2 +-
.../invitation/hooks/ISessionNegotiationHook.java | 2 +-
.../inf/dpp/misc/xstream/JIDConverter.java | 2 +-
.../inf/dpp/misc/xstream/UserConverter.java | 2 +-
.../{NetTransferMode.java => ConnectionMode.java} | 4 +-
.../de/fu_berlin/inf/dpp/net/ConnectionState.java | 11 +---
.../fu_berlin/inf/dpp/net/IConnectionManager.java | 5 +-
.../src/de/fu_berlin/inf/dpp/net/IReceiver.java | 8 +-
.../inf/dpp/net/ITransferModeListener.java | 8 +-
.../src/de/fu_berlin/inf/dpp/net/ITransmitter.java | 1 +
...osPacketCollector.java => PacketCollector.java} | 20 ++---
.../inf/dpp/net/SafeConnectionListener.java | 85 --------------------
.../fu_berlin/inf/dpp/net/SafePacketListener.java | 46 -----------
.../dpp/net/internal/BinaryChannelConnection.java | 10 +-
.../inf/dpp/net/internal/BinaryXMPPExtension.java | 10 +-
.../inf/dpp/net/internal/ByteStreamTransport.java | 6 +-
.../inf/dpp/net/internal/DataTransferManager.java | 16 ++--
.../inf/dpp/net/internal/IBBTransport.java | 6 +-
.../dpp/net/internal/IByteStreamConnection.java | 6 +-
.../internal/IByteStreamConnectionListener.java | 2 +-
.../fu_berlin/inf/dpp/net/internal/ITransport.java | 2 +-
.../inf/dpp/net/internal/Socks5Transport.java | 18 ++--
.../inf/dpp/net/internal/TCPTransport.java | 6 +-
.../inf/dpp/net/internal/TransferDescription.java | 2 +-
.../inf/dpp/net/internal/TransferModeDispatch.java | 8 +-
.../inf/dpp/net/internal/XMPPReceiver.java | 14 ++--
.../inf/dpp/net/internal/XMPPTransmitter.java | 6 +-
.../de/fu_berlin/inf/dpp/net/util/XMPPUtils.java | 4 +-
.../dpp/net/{ => xmpp}/IConnectionListener.java | 14 ++--
.../de/fu_berlin/inf/dpp/net/{ => xmpp}/JID.java | 2 +-
.../dpp/net/{ => xmpp}/XMPPConnectionService.java | 3 +-
.../net/{ => xmpp}/discovery/DiscoveryManager.java | 10 +-
.../discovery/DiscoveryManagerListener.java | 4 +-
.../roster/AbstractRosterListener.java} | 4 +-
.../dpp/net/{ => xmpp/roster}/IRosterListener.java | 2 +-
.../dpp/net/{ => xmpp/roster}/RosterTracker.java | 6 +-
.../subscription/SubscriptionHandler.java | 22 +++---
.../subscription/SubscriptionListener.java | 4 +-
.../fu_berlin/inf/dpp/session/ISarosSession.java | 2 +-
.../src/de/fu_berlin/inf/dpp/session/User.java | 4 +-
.../ActivitiesExtensionProviderTest.java | 2 +-
.../test/util/ClientSynchronizedDocument.java | 2 +-
.../dpp/concurrent/jupiter/test/util/Document.java | 2 +-
.../jupiter/test/util/DocumentTestChecker.java | 2 +-
.../jupiter/test/util/JupiterServer.java | 2 +-
.../jupiter/test/util/JupiterTestCase.java | 2 +-
.../jupiter/test/util/NetworkRequest.java | 2 +-
.../jupiter/test/util/NetworkSimulator.java | 2 +-
.../jupiter/test/util/ProxySynchronizedQueue.java | 2 +-
.../test/util/ServerSynchronizedDocument.java | 2 +-
.../test/util/TwoWayJupiterServerDocument.java | 2 +-
.../dpp/editor/colorstorage/ColorIDSetTest.java | 2 +-
.../inf/dpp/misc/xstream/UserConverterTest.java | 2 +-
.../junit/de/fu_berlin/inf/dpp/net/JIDTest.java | 2 +
.../fu_berlin/inf/dpp/net/RosterTrackerTest.java | 5 +
.../net/internal/BinaryChannelConnectionTest.java | 16 ++--
.../dpp/net/internal/DataTransferManagerTest.java | 68 ++++++++--------
.../inf/dpp/synchronize/StopManagerTest.java | 2 +-
.../fu_berlin/inf/dpp/test/mocks/SarosMocks.java | 2 +-
.../de/fu_berlin/inf/dpp/SarosCoreTestAction2.java | 2 +-
.../demoSuits/chat/ChatControlDemo.java | 2 +-
.../ui/widgetGallery/demoSuits/chat/ChatDemo.java | 2 +-
.../roster/BaseBuddySelectionCompositeDemo.java | 2 +-
.../roster/BuddyDisplayCompositeDemo.java | 2 +-
.../roster/BuddySelectionCompositeDemo.java | 2 +-
.../dpp/whiteboard/net/SarosSXETransmitter.java | 8 +-
.../inf/dpp/whiteboard/net/WhiteboardManager.java | 2 +-
de.fu_berlin.inf.dpp/plugin.xml | 8 +-
.../src/de/fu_berlin/inf/dpp/SarosContext.java | 2 +-
.../fu_berlin/inf/dpp/SarosCoreContextFactory.java | 8 +-
.../awareness/AwarenessInformationCollector.java | 2 +-
.../inf/dpp/communication/SkypeManager.java | 6 +-
.../muc/negotiation/MUCNegotiationManager.java | 4 +-
.../connection/ConnectionHandler.java | 6 +-
.../dpp/editor/colorstorage/ColorIDSetStorage.java | 2 +-
.../inf/dpp/feedback/DataTransferCollector.java | 18 ++--
.../inf/dpp/feedback/SelectionCollector.java | 2 +-
.../inf/dpp/feedback/TextEditCollector.java | 2 +-
.../dpp/invitation/IncomingProjectNegotiation.java | 6 +-
.../dpp/invitation/IncomingSessionNegotiation.java | 8 +-
.../dpp/invitation/OutgoingProjectNegotiation.java | 8 +-
.../dpp/invitation/OutgoingSessionNegotiation.java | 14 ++--
.../inf/dpp/invitation/ProjectNegotiation.java | 8 +-
.../inf/dpp/invitation/SessionNegotiation.java | 8 +-
.../inf/dpp/net/business/CancelInviteHandler.java | 2 +-
.../net/business/CancelProjectSharingHandler.java | 2 +-
.../inf/dpp/net/business/InvitationHandler.java | 2 +-
.../inf/dpp/net/business/LeaveAndKickHandler.java | 2 +-
.../observables/InvitationProcessObservable.java | 2 +-
.../observables/ProjectNegotiationObservable.java | 2 +-
.../inf/dpp/project/ISarosSessionManager.java | 2 +-
.../inf/dpp/project/SarosSessionManager.java | 6 +-
.../inf/dpp/project/internal/ActivityQueuer.java | 2 +-
.../dpp/project/internal/ActivitySequencer.java | 2 +-
.../dpp/project/internal/ChangeColorManager.java | 2 +-
.../dpp/project/internal/ColorNegotiationHook.java | 2 +-
.../internal/IActivitySequencerCallback.java | 2 +-
.../dpp/project/internal/SarosProjectMapper.java | 2 +-
.../inf/dpp/project/internal/SarosSession.java | 4 +-
.../project/internal/UserInformationHandler.java | 6 +-
.../timeout/ServerSessionTimeoutHandler.java | 2 +-
.../internal/timeout/SessionTimeoutHandler.java | 2 +-
.../inf/dpp/serviceProviders/NullSarosSession.java | 2 +-
.../fu_berlin/inf/dpp/ui/LocalPresenceTracker.java | 4 +-
.../dpp/ui/actions/ContactAvailabilityAction.java | 10 +-
.../inf/dpp/ui/actions/DeleteContactAction.java | 6 +-
.../inf/dpp/ui/actions/NewContactAction.java | 4 +-
.../inf/dpp/ui/actions/OpenChatAction.java | 4 +-
.../inf/dpp/ui/actions/RenameContactAction.java | 6 +-
.../inf/dpp/ui/actions/SendFileAction.java | 6 +-
.../fu_berlin/inf/dpp/ui/actions/SkypeAction.java | 2 +-
.../SharedProjectAddBuddiesHandler.java | 2 +-
.../SharedProjectAddSelectedBuddiesHandler.java | 2 +-
.../eventhandler/JoinSessionRejectedHandler.java | 2 +-
.../ui/eventhandler/JoinSessionRequestHandler.java | 2 +-
.../dpp/ui/eventhandler/NegotiationHandler.java | 4 +-
.../ui/eventhandler/ServerPreferenceHandler.java | 4 +-
.../eventhandler/SessionStatusRequestHandler.java | 2 +-
.../ui/eventhandler/XMPPAuthorizationHandler.java | 6 +-
.../dpp/ui/expressions/BuddyPropertyTester.java | 2 +-
.../fu_berlin/inf/dpp/ui/jobs/FileTransferJob.java | 2 +-
.../inf/dpp/ui/jobs/IncomingFileTransferJob.java | 2 +-
.../inf/dpp/ui/jobs/OutgoingFileTransferJob.java | 2 +-
.../ui/menuContributions/ProjectShareBuddies.java | 6 +-
.../ui/menuContributions/ProjectShareProjects.java | 2 +-
.../dpp/ui/model/roster/RosterAdapterFactory.java | 2 +-
.../dpp/ui/model/roster/RosterContentProvider.java | 6 +-
.../dpp/ui/model/roster/RosterEntryElement.java | 4 +-
.../dpp/ui/model/roster/RosterGroupElement.java | 2 +-
.../ui/model/session/SessionContentProvider.java | 4 +-
.../inf/dpp/ui/util/CollaborationUtils.java | 2 +-
.../de/fu_berlin/inf/dpp/ui/views/SarosView.java | 12 ++--
.../inf/dpp/ui/widgets/chat/ChatControl.java | 4 +-
.../dpp/ui/widgets/chat/ChatRoomsComposite.java | 10 +-
.../inf/dpp/ui/widgets/chat/parts/ChatDisplay.java | 2 +-
.../inf/dpp/ui/widgets/decoration/JIDCombo.java | 2 +-
.../viewer/roster/ContactSelectionComposite.java | 6 +-
.../roster/FilteredContactSelectionComposite.java | 2 +-
.../events/ContactSelectionChangedEvent.java | 2 +-
.../session/HideContactsInSessionFilter.java | 2 +-
.../session/XMPPSessionDisplayComposite.java | 4 +-
.../widgets/wizard/EnterXMPPAccountComposite.java | 2 +-
.../inf/dpp/ui/wizards/AddContactWizard.java | 6 +-
.../dpp/ui/wizards/AddContactsToSessionWizard.java | 2 +-
.../dpp/ui/wizards/AddProjectToSessionWizard.java | 2 +-
.../inf/dpp/ui/wizards/AddXMPPAccountWizard.java | 2 +-
.../inf/dpp/ui/wizards/EditXMPPAccountWizard.java | 2 +-
.../inf/dpp/ui/wizards/JoinSessionWizard.java | 2 +-
.../inf/dpp/ui/wizards/StartSessionWizard.java | 2 +-
.../dpp/ui/wizards/pages/AddContactWizardPage.java | 4 +-
.../pages/ConfigurationSummaryWizardPage.java | 2 +-
.../wizards/pages/ContactSelectionWizardPage.java | 6 +-
.../wizards/pages/EditXMPPAccountWizardPage.java | 2 +-
.../dpp/ui/wizards/pages/EnterProjectNamePage.java | 2 +-
.../wizards/pages/EnterXMPPAccountWizardPage.java | 2 +-
.../inf/dpp/util/log/JIDFileAppender.java | 6 +-
.../inf/dpp/versioning/VersionManager.java | 6 +-
.../fu_berlin/inf/dpp/stf/client/StfTestCase.java | 2 +-
.../inf/dpp/stf/client/tester/AbstractTester.java | 2 +-
.../inf/dpp/stf/client/tester/InvalidTester.java | 2 +-
.../inf/dpp/stf/client/tester/RealTester.java | 2 +-
.../inf/dpp/stf/client/tester/SarosTester.java | 2 +-
.../inf/dpp/stf/client/tester/TesterFactory.java | 2 +-
.../de/fu_berlin/inf/dpp/stf/client/util/Util.java | 2 +-
.../inf/dpp/stf/server/StfRemoteObject.java | 2 +-
.../manipulation/INetworkManipulator.java | 2 +-
.../manipulation/impl/NetworkManipulatorImpl.java | 2 +-
.../inf/dpp/stf/server/rmi/superbot/ISuperBot.java | 2 +-
.../contextmenu/peview/submenu/IShareWithC.java | 2 +-
.../peview/submenu/impl/ShareWithC.java | 2 +-
.../sarosview/IContextMenusInContactListArea.java | 2 +-
.../sarosview/IContextMenusInSessionArea.java | 2 +-
.../impl/ContextMenusInContactListArea.java | 2 +-
.../sarosview/impl/ContextMenusInSessionArea.java | 2 +-
.../submenu/IWorkTogetherOnContextMenu.java | 2 +-
.../submenu/impl/WorkTogetherOnContextMenu.java | 2 +-
.../component/menubar/menu/ISarosMenu.java | 2 +-
.../component/menubar/menu/impl/SarosMenu.java | 2 +-
.../menubar/menu/submenu/ISarosPreferences.java | 2 +-
.../menu/submenu/impl/SarosPreferences.java | 2 +-
.../superbot/component/view/saros/ISarosView.java | 2 +-
.../component/view/saros/impl/SarosView.java | 2 +-
.../dpp/stf/server/rmi/superbot/impl/SuperBot.java | 2 +-
.../editor/colorstorage/ColorIDSetStorageTest.java | 2 +-
.../ContributionAnnotationManagerTest.java | 4 +-
.../inf/dpp/feedback/StatisticCollectorTest.java | 2 +-
.../inf/dpp/project/SarosSessionManagerTest.java | 2 +-
.../dpp/project/internal/ActivityQueuerTest.java | 2 +-
.../project/internal/ActivitySequencerTest.java | 2 +-
.../inf/dpp/project/internal/SarosSessionTest.java | 8 +-
.../internal/UserInformationHandlerTest.java | 8 +-
.../dpp/test/fakes/net/FakeConnectionFactory.java | 2 +-
.../dpp/test/fakes/net/FakePacketTransmitter.java | 2 +-
.../dpp/test/fakes/net/NonThreadedReceiver.java | 10 +-
.../inf/dpp/test/stubs/SarosSessionStub.java | 2 +-
.../fu_berlin/inf/dpp/util/ActivityUtilsTest.java | 2 +-
.../inf/dpp/versioning/VersionManagerTest.java | 2 +-
.../de/fu_berlin/inf/dpp/stf/test/Constants.java | 2 +-
.../stf/test/account/AccountPreferenceTest.java | 2 +-
.../manipulation/NetworkManipulatorTest.java | 2 +-
217 files changed, 460 insertions(+), 582 deletions(-)
rename
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{NetTransferMode.java =>
ConnectionMode.java} (81%)
rename
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{SarosPacketCollector.java
=> PacketCollector.java} (85%)
delete mode 100644
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/SafeConnectionListener.java
delete mode 100644
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/SafePacketListener.java
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/IConnectionListener.java (85%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/JID.java (99%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/XMPPConnectionService.java (99%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/discovery/DiscoveryManager.java (98%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/discovery/DiscoveryManagerListener.java (84%)
rename
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{RosterAdapter.java =>
xmpp/roster/AbstractRosterListener.java} (83%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp/roster}/IRosterListener.java (80%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp/roster}/RosterTracker.java (96%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/subscription/SubscriptionHandler.java (94%)
rename de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/net/{ =>
xmpp}/subscription/SubscriptionListener.java (79%)
hooks/post-receive
--
The Saros Eclipse Plugin
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Dpp-robot mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-robot
