홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
21e03649 1 parent a7c3dd14

Cleaning up Javadocs. 

Change-Id: I41d075e3e6f6a26b340ce21a5baa8b238dc069ad
Inline Side-by-side
Showing 8 changed files with 74 additions and 9 deletions
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Definitions of events and messages pertaining to replication of flow entries.
19 + */
20 +package org.onlab.onos.store.flow;
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Implementation of distributed intent store.
19 + */
20 +package org.onlab.onos.store.intent.impl;
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Cluster messaging and distributed store serializers.
19 + */
20 +package org.onlab.onos.store.serializers.impl;
...@@ -61,7 +61,13 @@ ...@@ -61,7 +61,13 @@
61 <group> 61 <group>
62 <title>Core Subsystems</title> 62 <title>Core Subsystems</title>
63 <packages> 63 <packages>
64 - org.onlab.onos.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.json:org.onlab.onos.json.*:org.onlab.onos.provider.host.impl:org.onlab.onos.provider.lldp.impl:org.onlab.onos.net.statistic.impl 64 + org.onlab.onos.impl:org.onlab.onos.core.impl:org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.net.intent.impl:org.onlab.onos.net.proxyarp.impl:org.onlab.onos.mastership.impl:org.onlab.onos.net.resource.impl:org.onlab.onos.json:org.onlab.onos.json.*:org.onlab.onos.provider.host.impl:org.onlab.onos.provider.lldp.impl:org.onlab.onos.net.statistic.impl
65 + </packages>
66 + </group>
67 + <group>
68 + <title>Distributed Stores</title>
69 + <packages>
70 + org.onlab.onos.store.*
65 </packages> 71 </packages>
66 </group> 72 </group>
67 <group> 73 <group>
...@@ -92,12 +98,11 @@ ...@@ -92,12 +98,11 @@
92 <group> 98 <group>
93 <title>Test Instrumentation</title> 99 <title>Test Instrumentation</title>
94 <packages> 100 <packages>
95 - org.onlab.onos.metrics.*:org.onlab.onos.oecfg 101 + org.onlab.onos.metrics.*
96 </packages> 102 </packages>
97 </group> 103 </group>
98 </groups> 104 </groups>
99 - <excludePackageNames>org.onlab.thirdparty 105 + <excludePackageNames>org.onlab.thirdparty:org.onlab.onos.oecfg</excludePackageNames>
100 - </excludePackageNames>
101 </configuration> 106 </configuration>
102 </plugin> 107 </plugin>
103 </plugins> 108 </plugins>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onlab.api; 16 +package org.onlab.util;
17 17
18 /** 18 /**
19 * Represents condition where an item is not found or not available. 19 * Represents condition where an item is not found or not available.
......
...@@ -17,7 +17,7 @@ package org.onlab.onos.rest; ...@@ -17,7 +17,7 @@ package org.onlab.onos.rest;
17 17
18 import com.fasterxml.jackson.databind.ObjectMapper; 18 import com.fasterxml.jackson.databind.ObjectMapper;
19 import com.fasterxml.jackson.databind.node.ObjectNode; 19 import com.fasterxml.jackson.databind.node.ObjectNode;
20 -import org.onlab.api.ItemNotFoundException; 20 +import org.onlab.util.ItemNotFoundException;
21 import org.onlab.onos.codec.CodecContext; 21 import org.onlab.onos.codec.CodecContext;
22 import org.onlab.onos.codec.CodecService; 22 import org.onlab.onos.codec.CodecService;
23 import org.onlab.onos.codec.JsonCodec; 23 import org.onlab.onos.codec.JsonCodec;
...@@ -69,7 +69,7 @@ public class AbstractWebResource extends BaseResource implements CodecContext { ...@@ -69,7 +69,7 @@ public class AbstractWebResource extends BaseResource implements CodecContext {
69 * @param message not found message 69 * @param message not found message
70 * @param <T> item type 70 * @param <T> item type
71 * @return item if not null 71 * @return item if not null
72 - * @throws org.onlab.api.ItemNotFoundException if item is null 72 + * @throws org.onlab.util.ItemNotFoundException if item is null
73 */ 73 */
74 protected <T> T nullIsNotFound(T item, String message) { 74 protected <T> T nullIsNotFound(T item, String message) {
75 if (item == null) { 75 if (item == null) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 */ 15 */
16 package org.onlab.onos.rest.exceptions; 16 package org.onlab.onos.rest.exceptions;
17 17
18 -import org.onlab.api.ItemNotFoundException; 18 +import org.onlab.util.ItemNotFoundException;
19 19
20 import javax.ws.rs.core.Response; 20 import javax.ws.rs.core.Response;
21 21
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
132 com.fasterxml.jackson.databind.node, 132 com.fasterxml.jackson.databind.node,
133 com.google.common.base.*, 133 com.google.common.base.*,
134 org.eclipse.jetty.websocket.*, 134 org.eclipse.jetty.websocket.*,
135 - org.onlab.api.*, 135 + org.onlab.util.*,
136 org.onlab.osgi.*, 136 org.onlab.osgi.*,
137 org.onlab.packet.*, 137 org.onlab.packet.*,
138 org.onlab.rest.*, 138 org.onlab.rest.*,
......