fa891c9a0fea23d286887f2be64fab42b63b0d6e - onos

commit	fa891c9a0fea23d286887f2be64fab42b63b0d6e	[log] [tgz]
author	Yuta HIGUCHI <y-higuchi@onlab.us>	Thu Oct 09 15:21:40 2014 -0700
committer	Yuta HIGUCHI <y-higuchi@onlab.us>	Thu Oct 09 15:28:45 2014 -0700
tree	2312c9dcf39e56cca2d0e09f846966bc19b34483
parent	89791c6079e6f54e73c638a094b7ebaa6ad1caea [diff]

Revert "Refactoring to move code to right locations. Attempt at breaking dependency cycles."

This reverts commit 58819b4dcc697f63872bee9f3ddd41a0c4d8fca5.

cli/src/main/java/org/onlab/onos/cli/MastersListCommand.java[diff]
cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java[diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipAdminService.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipAdminService.java - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipEvent.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipEvent.java - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipListener.java[Added - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipService.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipService.java - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipStore.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipStore.java - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipStoreDelegate.java[Added - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipTerm.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipTerm.java - diff]
core/api/src/main/java/org/onlab/onos/cluster/MastershipTermService.java[Renamed from core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipTermService.java - diff]
core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipListener.java[Deleted - diff]
core/api/src/main/java/org/onlab/onos/net/device/DeviceMastershipStoreDelegate.java[Deleted - diff]
core/api/src/main/java/org/onlab/onos/store/ClockProviderService.java[diff]
core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java[diff]
core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java[diff]
core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java[diff]
core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java[diff]
core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java[diff]
core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/common/impl/AntiEntropyReply.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/common/impl/MastershipBasedTimestamp.java[Renamed from core/store/dist/src/main/java/org/onlab/onos/store/common/impl/DeviceMastershipBasedTimestamp.java - diff]
core/store/dist/src/main/java/org/onlab/onos/store/common/impl/MastershipBasedTimestampSerializer.java[Deleted - diff]
core/store/dist/src/main/java/org/onlab/onos/store/common/impl/Timestamped.java[Renamed from core/api/src/main/java/org/onlab/onos/store/Timestamped.java - diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyAdvertisement.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyReply.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEvent.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEventSerializer.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEvent.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEventSerializer.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEvent.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEventSerializer.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/VersionedValue.java[Renamed from core/api/src/main/java/org/onlab/onos/store/VersionedValue.java - diff]
core/store/dist/src/main/java/org/onlab/onos/store/link/impl/OnosDistributedLinkStore.java[diff]
core/store/dist/src/main/java/org/onlab/onos/store/serializers/ClusterMessageSerializer.java[Renamed from core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterMessageSerializer.java - diff]
core/store/dist/src/main/java/org/onlab/onos/store/serializers/MastershipBasedTimestampSerializer.java[Added - diff]
core/store/dist/src/main/java/org/onlab/onos/store/serializers/MessageSubjectSerializer.java[Renamed from core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/MessageSubjectSerializer.java - diff]
core/store/dist/src/test/java/org/onlab/onos/store/common/impl/MastershipBasedTimestampTest.java[diff]
core/store/dist/src/test/java/org/onlab/onos/store/common/impl/TimestampedTest.java[diff]
core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java[diff]
core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java[diff]
core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java[diff]
core/store/hz/net/src/main/java/org/onlab/onos/store/device/impl/NoOpClockProviderService.java[diff]
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoPoolUtil.java[diff]
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/MastershipTermSerializer.java[diff]
core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java[diff]
core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/NoOpClockProviderService.java[diff]
core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java[diff]
core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStoreTest.java[diff]

51 files changed

tree: 2312c9dcf39e56cca2d0e09f846966bc19b34483