mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-04 02:01:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix split-package issue in onos-dist

Browse Source 
Change-Id: I6ae5e4cf5e60f905f1f24f85dd8d4b40f7dfd0d9
This commit is contained in:
Yuta HIGUCHI 2014-11-07 16:24:47 -08:00
parent e7fdd0da69
commit 60a190b2da
10 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java vendored
View File

@ -34,10 +34,10 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
import org.onlab.onos.store.cluster.messaging.ClusterMessage; import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;
import org.onlab.onos.store.serializers.ClusterMessageSerializer;
import org.onlab.onos.store.serializers.KryoNamespaces; import org.onlab.onos.store.serializers.KryoNamespaces;
import org.onlab.onos.store.serializers.KryoSerializer; import org.onlab.onos.store.serializers.KryoSerializer;
import org.onlab.onos.store.serializers.MessageSubjectSerializer; import org.onlab.onos.store.serializers.impl.ClusterMessageSerializer;
import org.onlab.onos.store.serializers.impl.MessageSubjectSerializer;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onlab.netty.Endpoint; import org.onlab.netty.Endpoint;
import org.onlab.netty.Message; import org.onlab.netty.Message;

2
core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java vendored
View File

@ -59,7 +59,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;
import org.onlab.onos.store.impl.Timestamped; import org.onlab.onos.store.impl.Timestamped;
import org.onlab.onos.store.serializers.KryoSerializer; import org.onlab.onos.store.serializers.KryoSerializer;
import org.onlab.onos.store.serializers.DistributedStoreSerializers; import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.packet.ChassisId; import org.onlab.packet.ChassisId;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.onlab.util.NewConcurrentHashMap; import org.onlab.util.NewConcurrentHashMap;

2
core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/DistributedFlowRuleStore.java vendored
View File

@ -75,9 +75,9 @@ import org.onlab.onos.store.flow.ReplicaInfoService;
import org.onlab.onos.store.hz.AbstractHazelcastStore; import org.onlab.onos.store.hz.AbstractHazelcastStore;
import org.onlab.onos.store.hz.SMap; import org.onlab.onos.store.hz.SMap;
import org.onlab.onos.store.serializers.DecodeTo; import org.onlab.onos.store.serializers.DecodeTo;
import org.onlab.onos.store.serializers.DistributedStoreSerializers;
import org.onlab.onos.store.serializers.KryoSerializer; import org.onlab.onos.store.serializers.KryoSerializer;
import org.onlab.onos.store.serializers.StoreSerializer; import org.onlab.onos.store.serializers.StoreSerializer;
import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.slf4j.Logger; import org.slf4j.Logger;

2
core/store/dist/src/main/java/org/onlab/onos/store/host/impl/GossipHostStore.java vendored
View File

@ -67,8 +67,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;
import org.onlab.onos.store.impl.Timestamped; import org.onlab.onos.store.impl.Timestamped;
import org.onlab.onos.store.serializers.DistributedStoreSerializers;
import org.onlab.onos.store.serializers.KryoSerializer; import org.onlab.onos.store.serializers.KryoSerializer;
import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.packet.IpAddress; import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress; import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId; import org.onlab.packet.VlanId;

2
core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java vendored
View File

@ -55,8 +55,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage;
import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;
import org.onlab.onos.store.impl.Timestamped; import org.onlab.onos.store.impl.Timestamped;
import org.onlab.onos.store.serializers.DistributedStoreSerializers;
import org.onlab.onos.store.serializers.KryoSerializer; import org.onlab.onos.store.serializers.KryoSerializer;
import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import org.slf4j.Logger; import org.slf4j.Logger;

2
core/store/dist/src/main/java/org/onlab/onos/store/serializers/ClusterMessageSerializer.java → core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/ClusterMessageSerializer.java vendored
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onlab.onos.store.serializers; package org.onlab.onos.store.serializers.impl;
import org.onlab.onos.cluster.NodeId; import org.onlab.onos.cluster.NodeId;
import org.onlab.onos.store.cluster.messaging.ClusterMessage; import org.onlab.onos.store.cluster.messaging.ClusterMessage;

3
core/store/dist/src/main/java/org/onlab/onos/store/serializers/DistributedStoreSerializers.java → core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/DistributedStoreSerializers.java vendored
View File

@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onlab.onos.store.serializers; package org.onlab.onos.store.serializers.impl;
import org.onlab.onos.store.impl.MastershipBasedTimestamp; import org.onlab.onos.store.impl.MastershipBasedTimestamp;
import org.onlab.onos.store.impl.Timestamped; import org.onlab.onos.store.impl.Timestamped;
import org.onlab.onos.store.impl.WallClockTimestamp; import org.onlab.onos.store.impl.WallClockTimestamp;
import org.onlab.onos.store.serializers.KryoNamespaces;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
public final class DistributedStoreSerializers { public final class DistributedStoreSerializers {

2
core/store/dist/src/main/java/org/onlab/onos/store/serializers/MastershipBasedTimestampSerializer.java → core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MastershipBasedTimestampSerializer.java vendored
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onlab.onos.store.serializers; package org.onlab.onos.store.serializers.impl;
import org.onlab.onos.store.impl.MastershipBasedTimestamp; import org.onlab.onos.store.impl.MastershipBasedTimestamp;

2
core/store/dist/src/main/java/org/onlab/onos/store/serializers/MessageSubjectSerializer.java → core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MessageSubjectSerializer.java vendored
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onlab.onos.store.serializers; package org.onlab.onos.store.serializers.impl;
import org.onlab.onos.store.cluster.messaging.MessageSubject; import org.onlab.onos.store.cluster.messaging.MessageSubject;

2
core/store/dist/src/test/java/org/onlab/onos/store/impl/MastershipBasedTimestampTest.java vendored
View File

@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import org.junit.Test; import org.junit.Test;
import org.onlab.onos.store.Timestamp; import org.onlab.onos.store.Timestamp;
import org.onlab.onos.store.serializers.MastershipBasedTimestampSerializer; import org.onlab.onos.store.serializers.impl.MastershipBasedTimestampSerializer;
import org.onlab.util.KryoNamespace; import org.onlab.util.KryoNamespace;
import com.google.common.testing.EqualsTester; import com.google.common.testing.EqualsTester;