홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
abafb50f 1 parent 03defe79

Changing org.onlab.onos package to org.onosproject 

Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
Expand all
Inline Side-by-side
Showing 1000 changed files with 480 additions and 480 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 37
38 <dependencies> 38 <dependencies>
39 <dependency> 39 <dependency>
40 - <groupId>org.onlab.onos</groupId> 40 + <groupId>org.onosproject</groupId>
41 <artifactId>onlab-rest</artifactId> 41 <artifactId>onlab-rest</artifactId>
42 <version>${project.version}</version> 42 <version>${project.version}</version>
43 </dependency> 43 </dependency>
...@@ -64,23 +64,23 @@ ...@@ -64,23 +64,23 @@
64 </dependency> 64 </dependency>
65 65
66 <dependency> 66 <dependency>
67 - <groupId>org.onlab.onos</groupId> 67 + <groupId>org.onosproject</groupId>
68 <artifactId>onlab-thirdparty</artifactId> 68 <artifactId>onlab-thirdparty</artifactId>
69 </dependency> 69 </dependency>
70 70
71 <dependency> 71 <dependency>
72 - <groupId>org.onlab.onos</groupId> 72 + <groupId>org.onosproject</groupId>
73 <artifactId>onlab-misc</artifactId> 73 <artifactId>onlab-misc</artifactId>
74 </dependency> 74 </dependency>
75 75
76 <dependency> 76 <dependency>
77 - <groupId>org.onlab.onos</groupId> 77 + <groupId>org.onosproject</groupId>
78 <artifactId>onlab-junit</artifactId> 78 <artifactId>onlab-junit</artifactId>
79 <scope>test</scope> 79 <scope>test</scope>
80 </dependency> 80 </dependency>
81 81
82 <dependency> 82 <dependency>
83 - <groupId>org.onlab.onos</groupId> 83 + <groupId>org.onosproject</groupId>
84 <artifactId>onos-cli</artifactId> 84 <artifactId>onos-cli</artifactId>
85 <version>${project.version}</version> 85 <version>${project.version}</version>
86 </dependency> 86 </dependency>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 com.sun.jersey.server.impl.container.servlet, 111 com.sun.jersey.server.impl.container.servlet,
112 org.onlab.packet.*, 112 org.onlab.packet.*,
113 org.onlab.rest.*, 113 org.onlab.rest.*,
114 - org.onlab.onos.* 114 + org.onosproject.*
115 </Import-Package> 115 </Import-Package>
116 <Web-ContextPath>${web.context}</Web-ContextPath> 116 <Web-ContextPath>${web.context}</Web-ContextPath>
117 </instructions> 117 </instructions>
......
...@@ -13,20 +13,20 @@ ...@@ -13,20 +13,20 @@
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.onos.calendar; 16 +package org.onosproject.calendar;
17 17
18 import java.net.URI; 18 import java.net.URI;
19 import java.util.concurrent.CountDownLatch; 19 import java.util.concurrent.CountDownLatch;
20 import java.util.concurrent.TimeUnit; 20 import java.util.concurrent.TimeUnit;
21 21
22 -import org.onlab.onos.net.ConnectPoint; 22 +import org.onosproject.net.ConnectPoint;
23 -import org.onlab.onos.net.DeviceId; 23 +import org.onosproject.net.DeviceId;
24 -import org.onlab.onos.net.intent.Intent; 24 +import org.onosproject.net.intent.Intent;
25 -import org.onlab.onos.net.intent.IntentEvent; 25 +import org.onosproject.net.intent.IntentEvent;
26 -import org.onlab.onos.net.intent.IntentId; 26 +import org.onosproject.net.intent.IntentId;
27 -import org.onlab.onos.net.intent.IntentListener; 27 +import org.onosproject.net.intent.IntentListener;
28 -import org.onlab.onos.net.intent.IntentService; 28 +import org.onosproject.net.intent.IntentService;
29 -import org.onlab.onos.net.intent.IntentState; 29 +import org.onosproject.net.intent.IntentState;
30 import org.onlab.rest.BaseResource; 30 import org.onlab.rest.BaseResource;
31 31
32 import javax.ws.rs.POST; 32 import javax.ws.rs.POST;
...@@ -34,20 +34,20 @@ import javax.ws.rs.DELETE; ...@@ -34,20 +34,20 @@ import javax.ws.rs.DELETE;
34 import javax.ws.rs.PathParam; 34 import javax.ws.rs.PathParam;
35 import javax.ws.rs.core.Response; 35 import javax.ws.rs.core.Response;
36 36
37 -import org.onlab.onos.core.ApplicationId; 37 +import org.onosproject.core.ApplicationId;
38 -import org.onlab.onos.core.CoreService; 38 +import org.onosproject.core.CoreService;
39 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 39 +import org.onosproject.net.flow.DefaultTrafficSelector;
40 -import org.onlab.onos.net.flow.TrafficSelector; 40 +import org.onosproject.net.flow.TrafficSelector;
41 -import org.onlab.onos.net.flow.TrafficTreatment; 41 +import org.onosproject.net.flow.TrafficTreatment;
42 -import org.onlab.onos.net.intent.PointToPointIntent; 42 +import org.onosproject.net.intent.PointToPointIntent;
43 import org.onlab.packet.Ethernet; 43 import org.onlab.packet.Ethernet;
44 44
45 -import static org.onlab.onos.net.PortNumber.portNumber; 45 +import static org.onosproject.net.PortNumber.portNumber;
46 -import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder; 46 +import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
47 47
48 -import static org.onlab.onos.net.intent.IntentState.FAILED; 48 +import static org.onosproject.net.intent.IntentState.FAILED;
49 -import static org.onlab.onos.net.intent.IntentState.INSTALLED; 49 +import static org.onosproject.net.intent.IntentState.INSTALLED;
50 -import static org.onlab.onos.net.intent.IntentState.WITHDRAWN; 50 +import static org.onosproject.net.intent.IntentState.WITHDRAWN;
51 import static org.slf4j.LoggerFactory.getLogger; 51 import static org.slf4j.LoggerFactory.getLogger;
52 52
53 import org.slf4j.Logger; 53 import org.slf4j.Logger;
...@@ -143,7 +143,7 @@ public class BandwidthCalendarResource extends BaseResource { ...@@ -143,7 +143,7 @@ public class BandwidthCalendarResource extends BaseResource {
143 } 143 }
144 144
145 protected ApplicationId appId() { 145 protected ApplicationId appId() {
146 - return get(CoreService.class).registerApplication("org.onlab.onos.calendar"); 146 + return get(CoreService.class).registerApplication("org.onosproject.calendar");
147 } 147 }
148 148
149 // Auxiliary listener to wait until the given intent reaches the installed or failed states. 149 // Auxiliary listener to wait until the given intent reaches the installed or failed states.
......
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
18 * Application providing integration between OSCARS and ONOS intent 18 * Application providing integration between OSCARS and ONOS intent
19 * framework via REST API. 19 * framework via REST API.
20 */ 20 */
21 -package org.onlab.onos.calendar;
...\ No newline at end of file ...\ No newline at end of file
21 +package org.onosproject.calendar;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 </init-param> 29 </init-param>
30 <init-param> 30 <init-param>
31 <param-name>com.sun.jersey.config.property.classnames</param-name> 31 <param-name>com.sun.jersey.config.property.classnames</param-name>
32 - <param-value>org.onlab.onos.calendar.BandwidthCalendarResource</param-value> 32 + <param-value>org.onosproject.calendar.BandwidthCalendarResource</param-value>
33 </init-param> 33 </init-param>
34 <load-on-startup>10</load-on-startup> 34 <load-on-startup>10</load-on-startup>
35 </servlet> 35 </servlet>
...@@ -39,4 +39,4 @@ ...@@ -39,4 +39,4 @@
39 <url-pattern>/*</url-pattern> 39 <url-pattern>/*</url-pattern>
40 </servlet-mapping> 40 </servlet-mapping>
41 41
42 -</web-app>
...\ No newline at end of file ...\ No newline at end of file
42 +</web-app>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <artifactId>jackson-annotations</artifactId> 41 <artifactId>jackson-annotations</artifactId>
42 </dependency> 42 </dependency>
43 <dependency> 43 <dependency>
44 - <groupId>org.onlab.onos</groupId> 44 + <groupId>org.onosproject</groupId>
45 <artifactId>onlab-misc</artifactId> 45 <artifactId>onlab-misc</artifactId>
46 </dependency> 46 </dependency>
47 </dependencies> 47 </dependencies>
......
...@@ -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.onos.config; 16 +package org.onosproject.config;
17 17
18 import java.util.Collections; 18 import java.util.Collections;
19 import java.util.List; 19 import java.util.List;
......
...@@ -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.onos.config; 16 +package org.onosproject.config;
17 17
18 import java.util.List; 18 import java.util.List;
19 19
......
...@@ -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.onos.config; 16 +package org.onosproject.config;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -28,12 +28,12 @@ import org.apache.felix.scr.annotations.Component; ...@@ -28,12 +28,12 @@ import org.apache.felix.scr.annotations.Component;
28 import org.apache.felix.scr.annotations.Deactivate; 28 import org.apache.felix.scr.annotations.Deactivate;
29 import org.apache.felix.scr.annotations.Reference; 29 import org.apache.felix.scr.annotations.Reference;
30 import org.apache.felix.scr.annotations.ReferenceCardinality; 30 import org.apache.felix.scr.annotations.ReferenceCardinality;
31 -import org.onlab.onos.net.ConnectPoint; 31 +import org.onosproject.net.ConnectPoint;
32 -import org.onlab.onos.net.DeviceId; 32 +import org.onosproject.net.DeviceId;
33 -import org.onlab.onos.net.PortNumber; 33 +import org.onosproject.net.PortNumber;
34 -import org.onlab.onos.net.host.HostAdminService; 34 +import org.onosproject.net.host.HostAdminService;
35 -import org.onlab.onos.net.host.InterfaceIpAddress; 35 +import org.onosproject.net.host.InterfaceIpAddress;
36 -import org.onlab.onos.net.host.PortAddresses; 36 +import org.onosproject.net.host.PortAddresses;
37 import org.onlab.packet.IpAddress; 37 import org.onlab.packet.IpAddress;
38 import org.onlab.packet.IpPrefix; 38 import org.onlab.packet.IpPrefix;
39 import org.onlab.packet.MacAddress; 39 import org.onlab.packet.MacAddress;
......
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
18 * Simple configuration module to read in supplementary network configuration 18 * Simple configuration module to read in supplementary network configuration
19 * from a file. 19 * from a file.
20 */ 20 */
21 -package org.onlab.onos.config; 21 +package org.onosproject.config;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
41 <artifactId>org.osgi.compendium</artifactId> 41 <artifactId>org.osgi.compendium</artifactId>
42 </dependency> 42 </dependency>
43 <dependency> 43 <dependency>
44 - <groupId>org.onlab.onos</groupId> 44 + <groupId>org.onosproject</groupId>
45 <artifactId>onlab-rest</artifactId> 45 <artifactId>onlab-rest</artifactId>
46 <version>${project.version}</version> 46 <version>${project.version}</version>
47 </dependency> 47 </dependency>
48 48
49 <dependency> 49 <dependency>
50 - <groupId>org.onlab.onos</groupId> 50 + <groupId>org.onosproject</groupId>
51 <artifactId>onos-rest</artifactId> 51 <artifactId>onos-rest</artifactId>
52 <version>${project.version}</version> 52 <version>${project.version}</version>
53 </dependency> 53 </dependency>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 com.google.common.*, 109 com.google.common.*,
110 org.onlab.packet.*, 110 org.onlab.packet.*,
111 org.onlab.rest.*, 111 org.onlab.rest.*,
112 - org.onlab.onos.*, 112 + org.onosproject.*,
113 org.onlab.util.*, 113 org.onlab.util.*,
114 org.jboss.netty.util.* 114 org.jboss.netty.util.*
115 </Import-Package> 115 </Import-Package>
......
1 -package org.onlab.onos.demo; 1 +package org.onosproject.demo;
2 2
3 import com.fasterxml.jackson.databind.JsonNode; 3 import com.fasterxml.jackson.databind.JsonNode;
4 4
......
...@@ -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.onos.demo; 16 +package org.onosproject.demo;
17 17
18 import com.fasterxml.jackson.databind.JsonNode; 18 import com.fasterxml.jackson.databind.JsonNode;
19 import com.google.common.base.Predicate; 19 import com.google.common.base.Predicate;
...@@ -28,24 +28,24 @@ import org.apache.felix.scr.annotations.Reference; ...@@ -28,24 +28,24 @@ import org.apache.felix.scr.annotations.Reference;
28 import org.apache.felix.scr.annotations.ReferenceCardinality; 28 import org.apache.felix.scr.annotations.ReferenceCardinality;
29 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 30
31 -import org.onlab.onos.cluster.ClusterService; 31 +import org.onosproject.cluster.ClusterService;
32 -import org.onlab.onos.core.ApplicationId; 32 +import org.onosproject.core.ApplicationId;
33 -import org.onlab.onos.core.CoreService; 33 +import org.onosproject.core.CoreService;
34 -import org.onlab.onos.mastership.MastershipService; 34 +import org.onosproject.mastership.MastershipService;
35 -import org.onlab.onos.net.Host; 35 +import org.onosproject.net.Host;
36 -import org.onlab.onos.net.HostId; 36 +import org.onosproject.net.HostId;
37 -import org.onlab.onos.net.MastershipRole; 37 +import org.onosproject.net.MastershipRole;
38 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 38 +import org.onosproject.net.flow.DefaultTrafficSelector;
39 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 39 +import org.onosproject.net.flow.DefaultTrafficTreatment;
40 -import org.onlab.onos.net.flow.TrafficSelector; 40 +import org.onosproject.net.flow.TrafficSelector;
41 -import org.onlab.onos.net.flow.TrafficTreatment; 41 +import org.onosproject.net.flow.TrafficTreatment;
42 -import org.onlab.onos.net.host.HostService; 42 +import org.onosproject.net.host.HostService;
43 -import org.onlab.onos.net.intent.Constraint; 43 +import org.onosproject.net.intent.Constraint;
44 -import org.onlab.onos.net.intent.HostToHostIntent; 44 +import org.onosproject.net.intent.HostToHostIntent;
45 -import org.onlab.onos.net.intent.Intent; 45 +import org.onosproject.net.intent.Intent;
46 -import org.onlab.onos.net.intent.IntentBatchService; 46 +import org.onosproject.net.intent.IntentBatchService;
47 -import org.onlab.onos.net.intent.IntentOperations; 47 +import org.onosproject.net.intent.IntentOperations;
48 -import org.onlab.onos.net.intent.IntentService; 48 +import org.onosproject.net.intent.IntentService;
49 import org.slf4j.Logger; 49 import org.slf4j.Logger;
50 50
51 51
...@@ -108,7 +108,7 @@ public class DemoInstaller implements DemoAPI { ...@@ -108,7 +108,7 @@ public class DemoInstaller implements DemoAPI {
108 @Activate 108 @Activate
109 public void activate() { 109 public void activate() {
110 String nodeId = clusterService.getLocalNode().ip().toString(); 110 String nodeId = clusterService.getLocalNode().ip().toString();
111 - appId = coreService.registerApplication("org.onlab.onos.demo.installer." 111 + appId = coreService.registerApplication("org.onosproject.demo.installer."
112 + nodeId); 112 + nodeId);
113 worker = Executors.newFixedThreadPool(1, 113 worker = Executors.newFixedThreadPool(1,
114 new ThreadFactoryBuilder() 114 new ThreadFactoryBuilder()
......
1 -package org.onlab.onos.demo; 1 +package org.onosproject.demo;
2 2
3 import com.fasterxml.jackson.databind.JsonNode; 3 import com.fasterxml.jackson.databind.JsonNode;
4 import com.fasterxml.jackson.databind.ObjectMapper; 4 import com.fasterxml.jackson.databind.ObjectMapper;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Demo applications live here. 18 * Demo applications live here.
19 */ 19 */
20 -package org.onlab.onos.demo; 20 +package org.onosproject.demo;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <init-param> 30 <init-param>
31 <param-name>com.sun.jersey.config.property.classnames</param-name> 31 <param-name>com.sun.jersey.config.property.classnames</param-name>
32 <param-value> 32 <param-value>
33 - org.onlab.onos.demo.DemoResource 33 + org.onosproject.demo.DemoResource
34 </param-value> 34 </param-value>
35 </init-param> 35 </init-param>
36 <load-on-startup>1</load-on-startup> 36 <load-on-startup>1</load-on-startup>
...@@ -41,4 +41,4 @@ ...@@ -41,4 +41,4 @@
41 <url-pattern>/*</url-pattern> 41 <url-pattern>/*</url-pattern>
42 </servlet-mapping> 42 </servlet-mapping>
43 43
44 -</web-app>
...\ No newline at end of file ...\ No newline at end of file
44 +</web-app>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -33,22 +33,22 @@ ...@@ -33,22 +33,22 @@
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 - <groupId>org.onlab.onos</groupId> 36 + <groupId>org.onosproject</groupId>
37 <artifactId>onos-cli</artifactId> 37 <artifactId>onos-cli</artifactId>
38 <version>${project.version}</version> 38 <version>${project.version}</version>
39 </dependency> 39 </dependency>
40 <dependency> 40 <dependency>
41 - <groupId>org.onlab.onos</groupId> 41 + <groupId>org.onosproject</groupId>
42 <artifactId>onlab-osgi</artifactId> 42 <artifactId>onlab-osgi</artifactId>
43 <version>${project.version}</version> 43 <version>${project.version}</version>
44 </dependency> 44 </dependency>
45 <dependency> 45 <dependency>
46 - <groupId>org.onlab.onos</groupId> 46 + <groupId>org.onosproject</groupId>
47 <artifactId>onlab-nio</artifactId> 47 <artifactId>onlab-nio</artifactId>
48 <version>${project.version}</version> 48 <version>${project.version}</version>
49 </dependency> 49 </dependency>
50 <dependency> 50 <dependency>
51 - <groupId>org.onlab.onos</groupId> 51 + <groupId>org.onosproject</groupId>
52 <artifactId>onlab-netty</artifactId> 52 <artifactId>onlab-netty</artifactId>
53 <version>${project.version}</version> 53 <version>${project.version}</version>
54 </dependency> 54 </dependency>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 <artifactId>org.apache.karaf.shell.console</artifactId> 57 <artifactId>org.apache.karaf.shell.console</artifactId>
58 </dependency> 58 </dependency>
59 <dependency> 59 <dependency>
60 - <groupId>org.onlab.onos</groupId> 60 + <groupId>org.onosproject</groupId>
61 <artifactId>onlab-misc</artifactId> 61 <artifactId>onlab-misc</artifactId>
62 </dependency> 62 </dependency>
63 <dependency> 63 <dependency>
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import static java.util.concurrent.Executors.newScheduledThreadPool; 18 import static java.util.concurrent.Executors.newScheduledThreadPool;
19 import static org.onlab.util.Tools.namedThreads; 19 import static org.onlab.util.Tools.namedThreads;
...@@ -30,25 +30,25 @@ import org.apache.felix.scr.annotations.Component; ...@@ -30,25 +30,25 @@ import org.apache.felix.scr.annotations.Component;
30 import org.apache.felix.scr.annotations.Deactivate; 30 import org.apache.felix.scr.annotations.Deactivate;
31 import org.apache.felix.scr.annotations.Reference; 31 import org.apache.felix.scr.annotations.Reference;
32 import org.apache.felix.scr.annotations.ReferenceCardinality; 32 import org.apache.felix.scr.annotations.ReferenceCardinality;
33 -import org.onlab.onos.cluster.ClusterEvent; 33 +import org.onosproject.cluster.ClusterEvent;
34 -import org.onlab.onos.cluster.ClusterEventListener; 34 +import org.onosproject.cluster.ClusterEventListener;
35 -import org.onlab.onos.cluster.ClusterService; 35 +import org.onosproject.cluster.ClusterService;
36 -import org.onlab.onos.cluster.NodeId; 36 +import org.onosproject.cluster.NodeId;
37 -import org.onlab.onos.mastership.MastershipEvent; 37 +import org.onosproject.mastership.MastershipEvent;
38 -import org.onlab.onos.mastership.MastershipListener; 38 +import org.onosproject.mastership.MastershipListener;
39 -import org.onlab.onos.mastership.MastershipService; 39 +import org.onosproject.mastership.MastershipService;
40 -import org.onlab.onos.net.device.DeviceEvent; 40 +import org.onosproject.net.device.DeviceEvent;
41 -import org.onlab.onos.net.device.DeviceListener; 41 +import org.onosproject.net.device.DeviceListener;
42 -import org.onlab.onos.net.device.DeviceService; 42 +import org.onosproject.net.device.DeviceService;
43 -import org.onlab.onos.net.intent.IntentEvent; 43 +import org.onosproject.net.intent.IntentEvent;
44 -import org.onlab.onos.net.intent.IntentListener; 44 +import org.onosproject.net.intent.IntentListener;
45 -import org.onlab.onos.net.intent.IntentService; 45 +import org.onosproject.net.intent.IntentService;
46 -import org.onlab.onos.store.service.DatabaseAdminService; 46 +import org.onosproject.store.service.DatabaseAdminService;
47 -import org.onlab.onos.store.service.DatabaseException; 47 +import org.onosproject.store.service.DatabaseException;
48 -import org.onlab.onos.store.service.DatabaseService; 48 +import org.onosproject.store.service.DatabaseService;
49 -import org.onlab.onos.store.service.Lock; 49 +import org.onosproject.store.service.Lock;
50 -import org.onlab.onos.store.service.LockService; 50 +import org.onosproject.store.service.LockService;
51 -import org.onlab.onos.store.service.VersionedValue; 51 +import org.onosproject.store.service.VersionedValue;
52 import org.slf4j.Logger; 52 import org.slf4j.Logger;
53 53
54 /** 54 /**
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import com.google.common.collect.Lists; 18 import com.google.common.collect.Lists;
19 import org.onlab.nio.IOLoop; 19 import org.onlab.nio.IOLoop;
...@@ -43,7 +43,7 @@ import java.util.concurrent.TimeoutException; ...@@ -43,7 +43,7 @@ import java.util.concurrent.TimeoutException;
43 import static java.lang.String.format; 43 import static java.lang.String.format;
44 import static java.lang.System.nanoTime; 44 import static java.lang.System.nanoTime;
45 import static java.lang.System.out; 45 import static java.lang.System.out;
46 -import static org.onlab.onos.foo.IOLoopTestServer.PORT; 46 +import static org.onosproject.foo.IOLoopTestServer.PORT;
47 import static org.onlab.util.Tools.delay; 47 import static org.onlab.util.Tools.delay;
48 import static org.onlab.util.Tools.namedThreads; 48 import static org.onlab.util.Tools.namedThreads;
49 49
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import com.google.common.collect.Lists; 18 import com.google.common.collect.Lists;
19 import org.onlab.nio.AcceptorLoop; 19 import org.onlab.nio.AcceptorLoop;
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import java.io.IOException; 18 import java.io.IOException;
19 19
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.onlab.netty.Message; 18 import org.onlab.netty.Message;
19 import org.onlab.netty.MessageHandler; 19 import org.onlab.netty.MessageHandler;
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import static java.lang.Thread.sleep; 18 import static java.lang.Thread.sleep;
19 19
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 -import static org.onlab.onos.foo.SimpleNettyClient.startStandalone; 18 +import static org.onosproject.foo.SimpleNettyClient.startStandalone;
19 -import static org.onlab.onos.foo.SimpleNettyClient.stop; 19 +import static org.onosproject.foo.SimpleNettyClient.stop;
20 20
21 import org.apache.karaf.shell.commands.Argument; 21 import org.apache.karaf.shell.commands.Argument;
22 import org.apache.karaf.shell.commands.Command; 22 import org.apache.karaf.shell.commands.Command;
23 -import org.onlab.onos.cli.AbstractShellCommand; 23 +import org.onosproject.cli.AbstractShellCommand;
24 24
25 /** 25 /**
26 * Test Netty client performance. 26 * Test Netty client performance.
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.onlab.netty.NettyMessagingService; 18 import org.onlab.netty.NettyMessagingService;
19 import org.slf4j.Logger; 19 import org.slf4j.Logger;
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 -import static org.onlab.onos.foo.SimpleNettyServer.startStandalone; 18 +import static org.onosproject.foo.SimpleNettyServer.startStandalone;
19 19
20 import org.apache.karaf.shell.commands.Argument; 20 import org.apache.karaf.shell.commands.Argument;
21 import org.apache.karaf.shell.commands.Command; 21 import org.apache.karaf.shell.commands.Command;
22 -import org.onlab.onos.cli.AbstractShellCommand; 22 +import org.onosproject.cli.AbstractShellCommand;
23 23
24 /** 24 /**
25 * Starts the Simple Netty server. 25 * Starts the Simple Netty server.
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.apache.karaf.shell.commands.Argument; 18 import org.apache.karaf.shell.commands.Argument;
19 import org.apache.karaf.shell.commands.Command; 19 import org.apache.karaf.shell.commands.Command;
20 -import org.onlab.onos.cli.AbstractShellCommand; 20 +import org.onosproject.cli.AbstractShellCommand;
21 21
22 -import static org.onlab.onos.foo.IOLoopTestClient.startStandalone; 22 +import static org.onosproject.foo.IOLoopTestClient.startStandalone;
23 23
24 /** 24 /**
25 * Starts the test IO loop client. 25 * Starts the test IO loop client.
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.apache.karaf.shell.commands.Argument; 18 import org.apache.karaf.shell.commands.Argument;
19 import org.apache.karaf.shell.commands.Command; 19 import org.apache.karaf.shell.commands.Command;
20 -import org.onlab.onos.cli.AbstractShellCommand; 20 +import org.onosproject.cli.AbstractShellCommand;
21 21
22 -import static org.onlab.onos.foo.IOLoopTestServer.startStandalone; 22 +import static org.onosproject.foo.IOLoopTestServer.startStandalone;
23 23
24 /** 24 /**
25 * Starts the test IO loop server. 25 * Starts the test IO loop server.
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.onlab.nio.AbstractMessage; 18 import org.onlab.nio.AbstractMessage;
19 19
......
...@@ -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.onos.foo; 16 +package org.onosproject.foo;
17 17
18 import org.onlab.nio.IOLoop; 18 import org.onlab.nio.IOLoop;
19 import org.onlab.nio.MessageStream; 19 import org.onlab.nio.MessageStream;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Sample application for use in various experiments. 18 * Sample application for use in various experiments.
19 */ 19 */
20 -package org.onlab.onos.foo; 20 +package org.onosproject.foo;
......
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
17 17
18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0"> 18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
19 <command> 19 <command>
20 - <action class="org.onlab.onos.foo.TestIOClientCommand"/> 20 + <action class="org.onosproject.foo.TestIOClientCommand"/>
21 </command> 21 </command>
22 <command> 22 <command>
23 - <action class="org.onlab.onos.foo.TestIOServerCommand"/> 23 + <action class="org.onosproject.foo.TestIOServerCommand"/>
24 </command> 24 </command>
25 <command> 25 <command>
26 - <action class="org.onlab.onos.foo.SimpleNettyServerCommand"/> 26 + <action class="org.onosproject.foo.SimpleNettyServerCommand"/>
27 </command> 27 </command>
28 <command> 28 <command>
29 - <action class="org.onlab.onos.foo.SimpleNettyClientCommand"/> 29 + <action class="org.onosproject.foo.SimpleNettyClientCommand"/>
30 </command> 30 </command>
31 </command-bundle> 31 </command-bundle>
32 32
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
......
...@@ -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.onos.fwd; 16 +package org.onosproject.fwd;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -27,25 +27,25 @@ import org.apache.felix.scr.annotations.Modified; ...@@ -27,25 +27,25 @@ import org.apache.felix.scr.annotations.Modified;
27 import org.apache.felix.scr.annotations.Property; 27 import org.apache.felix.scr.annotations.Property;
28 import org.apache.felix.scr.annotations.Reference; 28 import org.apache.felix.scr.annotations.Reference;
29 import org.apache.felix.scr.annotations.ReferenceCardinality; 29 import org.apache.felix.scr.annotations.ReferenceCardinality;
30 -import org.onlab.onos.core.ApplicationId; 30 +import org.onosproject.core.ApplicationId;
31 -import org.onlab.onos.core.CoreService; 31 +import org.onosproject.core.CoreService;
32 -import org.onlab.onos.net.Host; 32 +import org.onosproject.net.Host;
33 -import org.onlab.onos.net.HostId; 33 +import org.onosproject.net.HostId;
34 -import org.onlab.onos.net.Path; 34 +import org.onosproject.net.Path;
35 -import org.onlab.onos.net.PortNumber; 35 +import org.onosproject.net.PortNumber;
36 -import org.onlab.onos.net.flow.DefaultFlowRule; 36 +import org.onosproject.net.flow.DefaultFlowRule;
37 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 37 +import org.onosproject.net.flow.DefaultTrafficSelector;
38 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 38 +import org.onosproject.net.flow.DefaultTrafficTreatment;
39 -import org.onlab.onos.net.flow.FlowRule; 39 +import org.onosproject.net.flow.FlowRule;
40 -import org.onlab.onos.net.flow.FlowRuleService; 40 +import org.onosproject.net.flow.FlowRuleService;
41 -import org.onlab.onos.net.flow.TrafficSelector; 41 +import org.onosproject.net.flow.TrafficSelector;
42 -import org.onlab.onos.net.flow.TrafficTreatment; 42 +import org.onosproject.net.flow.TrafficTreatment;
43 -import org.onlab.onos.net.host.HostService; 43 +import org.onosproject.net.host.HostService;
44 -import org.onlab.onos.net.packet.InboundPacket; 44 +import org.onosproject.net.packet.InboundPacket;
45 -import org.onlab.onos.net.packet.PacketContext; 45 +import org.onosproject.net.packet.PacketContext;
46 -import org.onlab.onos.net.packet.PacketProcessor; 46 +import org.onosproject.net.packet.PacketProcessor;
47 -import org.onlab.onos.net.packet.PacketService; 47 +import org.onosproject.net.packet.PacketService;
48 -import org.onlab.onos.net.topology.TopologyService; 48 +import org.onosproject.net.topology.TopologyService;
49 import org.onlab.packet.Ethernet; 49 import org.onlab.packet.Ethernet;
50 import org.osgi.service.component.ComponentContext; 50 import org.osgi.service.component.ComponentContext;
51 import org.slf4j.Logger; 51 import org.slf4j.Logger;
...@@ -86,7 +86,7 @@ public class ReactiveForwarding { ...@@ -86,7 +86,7 @@ public class ReactiveForwarding {
86 86
87 @Activate 87 @Activate
88 public void activate() { 88 public void activate() {
89 - appId = coreService.registerApplication("org.onlab.onos.fwd"); 89 + appId = coreService.registerApplication("org.onosproject.fwd");
90 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2); 90 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
91 log.info("Started with Application ID {}", appId.id()); 91 log.info("Started with Application ID {}", appId.id());
92 } 92 }
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Sample application that provides simple form of reactive forwarding. 18 * Sample application that provides simple form of reactive forwarding.
19 */ 19 */
20 -package org.onlab.onos.fwd; 20 +package org.onosproject.fwd;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
......
...@@ -13,32 +13,32 @@ ...@@ -13,32 +13,32 @@
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.onos.ifwd; 16 +package org.onosproject.ifwd;
17 17
18 import org.apache.felix.scr.annotations.Activate; 18 import org.apache.felix.scr.annotations.Activate;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 20 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 21 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 22 import org.apache.felix.scr.annotations.ReferenceCardinality;
23 -import org.onlab.onos.core.ApplicationId; 23 +import org.onosproject.core.ApplicationId;
24 -import org.onlab.onos.core.CoreService; 24 +import org.onosproject.core.CoreService;
25 -import org.onlab.onos.net.Host; 25 +import org.onosproject.net.Host;
26 -import org.onlab.onos.net.HostId; 26 +import org.onosproject.net.HostId;
27 -import org.onlab.onos.net.PortNumber; 27 +import org.onosproject.net.PortNumber;
28 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 28 +import org.onosproject.net.flow.DefaultTrafficSelector;
29 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 29 +import org.onosproject.net.flow.DefaultTrafficTreatment;
30 -import org.onlab.onos.net.flow.TrafficSelector; 30 +import org.onosproject.net.flow.TrafficSelector;
31 -import org.onlab.onos.net.flow.TrafficTreatment; 31 +import org.onosproject.net.flow.TrafficTreatment;
32 -import org.onlab.onos.net.host.HostService; 32 +import org.onosproject.net.host.HostService;
33 -import org.onlab.onos.net.intent.HostToHostIntent; 33 +import org.onosproject.net.intent.HostToHostIntent;
34 -import org.onlab.onos.net.intent.IntentService; 34 +import org.onosproject.net.intent.IntentService;
35 -import org.onlab.onos.net.packet.DefaultOutboundPacket; 35 +import org.onosproject.net.packet.DefaultOutboundPacket;
36 -import org.onlab.onos.net.packet.InboundPacket; 36 +import org.onosproject.net.packet.InboundPacket;
37 -import org.onlab.onos.net.packet.OutboundPacket; 37 +import org.onosproject.net.packet.OutboundPacket;
38 -import org.onlab.onos.net.packet.PacketContext; 38 +import org.onosproject.net.packet.PacketContext;
39 -import org.onlab.onos.net.packet.PacketProcessor; 39 +import org.onosproject.net.packet.PacketProcessor;
40 -import org.onlab.onos.net.packet.PacketService; 40 +import org.onosproject.net.packet.PacketService;
41 -import org.onlab.onos.net.topology.TopologyService; 41 +import org.onosproject.net.topology.TopologyService;
42 import org.onlab.packet.Ethernet; 42 import org.onlab.packet.Ethernet;
43 import org.slf4j.Logger; 43 import org.slf4j.Logger;
44 44
...@@ -72,7 +72,7 @@ public class IntentReactiveForwarding { ...@@ -72,7 +72,7 @@ public class IntentReactiveForwarding {
72 72
73 @Activate 73 @Activate
74 public void activate() { 74 public void activate() {
75 - appId = coreService.registerApplication("org.onlab.onos.ifwd"); 75 + appId = coreService.registerApplication("org.onosproject.ifwd");
76 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2); 76 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
77 log.info("Started"); 77 log.info("Started");
78 } 78 }
......
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
18 * Sample application that provides simple form of reactive forwarding 18 * Sample application that provides simple form of reactive forwarding
19 * using the intent service. 19 * using the intent service.
20 */ 20 */
21 -package org.onlab.onos.ifwd; 21 +package org.onosproject.ifwd;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-app-metrics</artifactId> 24 <artifactId>onos-app-metrics</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 - <groupId>org.onlab.onos</groupId> 36 + <groupId>org.onosproject</groupId>
37 <artifactId>onos-cli</artifactId> 37 <artifactId>onos-cli</artifactId>
38 <version>${project.version}</version> 38 <version>${project.version}</version>
39 </dependency> 39 </dependency>
......
...@@ -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.onos.metrics.intent; 16 +package org.onosproject.metrics.intent;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -29,11 +29,11 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -29,11 +29,11 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
29 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 import org.onlab.metrics.EventMetric; 30 import org.onlab.metrics.EventMetric;
31 import org.onlab.metrics.MetricsService; 31 import org.onlab.metrics.MetricsService;
32 -import org.onlab.onos.core.ApplicationId; 32 +import org.onosproject.core.ApplicationId;
33 -import org.onlab.onos.core.CoreService; 33 +import org.onosproject.core.CoreService;
34 -import org.onlab.onos.net.intent.IntentEvent; 34 +import org.onosproject.net.intent.IntentEvent;
35 -import org.onlab.onos.net.intent.IntentListener; 35 +import org.onosproject.net.intent.IntentListener;
36 -import org.onlab.onos.net.intent.IntentService; 36 +import org.onosproject.net.intent.IntentService;
37 import org.slf4j.Logger; 37 import org.slf4j.Logger;
38 38
39 /** 39 /**
...@@ -83,7 +83,7 @@ public class IntentMetrics implements IntentMetricsService, ...@@ -83,7 +83,7 @@ public class IntentMetrics implements IntentMetricsService,
83 @Activate 83 @Activate
84 protected void activate() { 84 protected void activate() {
85 appId = 85 appId =
86 - coreService.registerApplication("org.onlab.onos.metrics.intent"); 86 + coreService.registerApplication("org.onosproject.metrics.intent");
87 87
88 clear(); 88 clear();
89 registerMetrics(); 89 registerMetrics();
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
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.onos.metrics.intent; 16 +package org.onosproject.metrics.intent;
17 17
18 import java.util.List; 18 import java.util.List;
19 import org.onlab.metrics.EventMetric; 19 import org.onlab.metrics.EventMetric;
20 -import org.onlab.onos.net.intent.IntentEvent; 20 +import org.onosproject.net.intent.IntentEvent;
21 21
22 /** 22 /**
23 * Service interface exported by IntentMetrics. 23 * Service interface exported by IntentMetrics.
......
...@@ -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.onos.metrics.intent.cli; 16 +package org.onosproject.metrics.intent.cli;
17 17
18 import java.util.List; 18 import java.util.List;
19 19
...@@ -22,9 +22,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -22,9 +22,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
22 import com.fasterxml.jackson.databind.node.ArrayNode; 22 import com.fasterxml.jackson.databind.node.ArrayNode;
23 import com.fasterxml.jackson.databind.node.ObjectNode; 23 import com.fasterxml.jackson.databind.node.ObjectNode;
24 import org.apache.karaf.shell.commands.Command; 24 import org.apache.karaf.shell.commands.Command;
25 -import org.onlab.onos.cli.AbstractShellCommand; 25 +import org.onosproject.cli.AbstractShellCommand;
26 -import org.onlab.onos.metrics.intent.IntentMetricsService; 26 +import org.onosproject.metrics.intent.IntentMetricsService;
27 -import org.onlab.onos.net.intent.IntentEvent; 27 +import org.onosproject.net.intent.IntentEvent;
28 28
29 /** 29 /**
30 * Command to show the list of last intent events. 30 * Command to show the list of last intent events.
......
...@@ -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.onos.metrics.intent.cli; 16 +package org.onosproject.metrics.intent.cli;
17 17
18 import java.io.IOException; 18 import java.io.IOException;
19 import java.util.concurrent.TimeUnit; 19 import java.util.concurrent.TimeUnit;
...@@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
27 import com.fasterxml.jackson.databind.node.ObjectNode; 27 import com.fasterxml.jackson.databind.node.ObjectNode;
28 import org.apache.karaf.shell.commands.Command; 28 import org.apache.karaf.shell.commands.Command;
29 import org.onlab.metrics.EventMetric; 29 import org.onlab.metrics.EventMetric;
30 -import org.onlab.onos.cli.AbstractShellCommand; 30 +import org.onosproject.cli.AbstractShellCommand;
31 -import org.onlab.onos.metrics.intent.IntentMetricsService; 31 +import org.onosproject.metrics.intent.IntentMetricsService;
32 32
33 /** 33 /**
34 * Command to show the intent events metrics. 34 * Command to show the intent events metrics.
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Intent metrics command-line handlers. 18 * Intent metrics command-line handlers.
19 */ 19 */
20 -package org.onlab.onos.metrics.intent.cli;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.metrics.intent.cli;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * ONOS Intent Metrics Application that collects intent-related metrics. 18 * ONOS Intent Metrics Application that collects intent-related metrics.
19 */ 19 */
20 -package org.onlab.onos.metrics.intent; 20 +package org.onosproject.metrics.intent;
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 17
18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0"> 18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
19 <command> 19 <command>
20 - <action class="org.onlab.onos.metrics.intent.cli.IntentEventsListCommand"/> 20 + <action class="org.onosproject.metrics.intent.cli.IntentEventsListCommand"/>
21 </command> 21 </command>
22 <command> 22 <command>
23 - <action class="org.onlab.onos.metrics.intent.cli.IntentEventsMetricsCommand"/> 23 + <action class="org.onosproject.metrics.intent.cli.IntentEventsMetricsCommand"/>
24 </command> 24 </command>
25 </command-bundle> 25 </command-bundle>
26 26
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 38
39 <dependencies> 39 <dependencies>
40 <dependency> 40 <dependency>
41 - <groupId>org.onlab.onos</groupId> 41 + <groupId>org.onosproject</groupId>
42 <artifactId>onlab-misc</artifactId> 42 <artifactId>onlab-misc</artifactId>
43 </dependency> 43 </dependency>
44 44
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-app-metrics</artifactId> 24 <artifactId>onos-app-metrics</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 - <groupId>org.onlab.onos</groupId> 36 + <groupId>org.onosproject</groupId>
37 <artifactId>onos-cli</artifactId> 37 <artifactId>onos-cli</artifactId>
38 <version>${project.version}</version> 38 <version>${project.version}</version>
39 </dependency> 39 </dependency>
......
...@@ -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.onos.metrics.topology; 16 +package org.onosproject.metrics.topology;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -29,21 +29,21 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -29,21 +29,21 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
29 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 import org.onlab.metrics.EventMetric; 30 import org.onlab.metrics.EventMetric;
31 import org.onlab.metrics.MetricsService; 31 import org.onlab.metrics.MetricsService;
32 -import org.onlab.onos.core.ApplicationId; 32 +import org.onosproject.core.ApplicationId;
33 -import org.onlab.onos.core.CoreService; 33 +import org.onosproject.core.CoreService;
34 -import org.onlab.onos.event.Event; 34 +import org.onosproject.event.Event;
35 -import org.onlab.onos.net.device.DeviceEvent; 35 +import org.onosproject.net.device.DeviceEvent;
36 -import org.onlab.onos.net.device.DeviceListener; 36 +import org.onosproject.net.device.DeviceListener;
37 -import org.onlab.onos.net.device.DeviceService; 37 +import org.onosproject.net.device.DeviceService;
38 -import org.onlab.onos.net.host.HostEvent; 38 +import org.onosproject.net.host.HostEvent;
39 -import org.onlab.onos.net.host.HostListener; 39 +import org.onosproject.net.host.HostListener;
40 -import org.onlab.onos.net.host.HostService; 40 +import org.onosproject.net.host.HostService;
41 -import org.onlab.onos.net.link.LinkEvent; 41 +import org.onosproject.net.link.LinkEvent;
42 -import org.onlab.onos.net.link.LinkListener; 42 +import org.onosproject.net.link.LinkListener;
43 -import org.onlab.onos.net.link.LinkService; 43 +import org.onosproject.net.link.LinkService;
44 -import org.onlab.onos.net.topology.TopologyEvent; 44 +import org.onosproject.net.topology.TopologyEvent;
45 -import org.onlab.onos.net.topology.TopologyListener; 45 +import org.onosproject.net.topology.TopologyListener;
46 -import org.onlab.onos.net.topology.TopologyService; 46 +import org.onosproject.net.topology.TopologyService;
47 import org.slf4j.Logger; 47 import org.slf4j.Logger;
48 48
49 /** 49 /**
...@@ -106,7 +106,7 @@ public class TopologyMetrics implements TopologyMetricsService { ...@@ -106,7 +106,7 @@ public class TopologyMetrics implements TopologyMetricsService {
106 @Activate 106 @Activate
107 protected void activate() { 107 protected void activate() {
108 appId = 108 appId =
109 - coreService.registerApplication("org.onlab.onos.metrics.topology"); 109 + coreService.registerApplication("org.onosproject.metrics.topology");
110 110
111 clear(); 111 clear();
112 registerMetrics(); 112 registerMetrics();
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
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.onos.metrics.topology; 16 +package org.onosproject.metrics.topology;
17 17
18 import java.util.List; 18 import java.util.List;
19 import org.onlab.metrics.EventMetric; 19 import org.onlab.metrics.EventMetric;
20 -import org.onlab.onos.event.Event; 20 +import org.onosproject.event.Event;
21 21
22 /** 22 /**
23 * Service interface exported by TopologyMetrics. 23 * Service interface exported by TopologyMetrics.
......
...@@ -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.onos.metrics.topology.cli; 16 +package org.onosproject.metrics.topology.cli;
17 17
18 import java.util.List; 18 import java.util.List;
19 19
...@@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
22 import com.fasterxml.jackson.databind.node.ArrayNode; 22 import com.fasterxml.jackson.databind.node.ArrayNode;
23 import com.fasterxml.jackson.databind.node.ObjectNode; 23 import com.fasterxml.jackson.databind.node.ObjectNode;
24 import org.apache.karaf.shell.commands.Command; 24 import org.apache.karaf.shell.commands.Command;
25 -import org.onlab.onos.cli.AbstractShellCommand; 25 +import org.onosproject.cli.AbstractShellCommand;
26 -import org.onlab.onos.event.Event; 26 +import org.onosproject.event.Event;
27 -import org.onlab.onos.metrics.topology.TopologyMetricsService; 27 +import org.onosproject.metrics.topology.TopologyMetricsService;
28 -import org.onlab.onos.net.topology.TopologyEvent; 28 +import org.onosproject.net.topology.TopologyEvent;
29 29
30 /** 30 /**
31 * Command to show the list of last topology events. 31 * Command to show the list of last topology events.
......
...@@ -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.onos.metrics.topology.cli; 16 +package org.onosproject.metrics.topology.cli;
17 17
18 import java.io.IOException; 18 import java.io.IOException;
19 import java.util.concurrent.TimeUnit; 19 import java.util.concurrent.TimeUnit;
...@@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
27 import com.fasterxml.jackson.databind.node.ObjectNode; 27 import com.fasterxml.jackson.databind.node.ObjectNode;
28 import org.apache.karaf.shell.commands.Command; 28 import org.apache.karaf.shell.commands.Command;
29 import org.onlab.metrics.EventMetric; 29 import org.onlab.metrics.EventMetric;
30 -import org.onlab.onos.cli.AbstractShellCommand; 30 +import org.onosproject.cli.AbstractShellCommand;
31 -import org.onlab.onos.metrics.topology.TopologyMetricsService; 31 +import org.onosproject.metrics.topology.TopologyMetricsService;
32 32
33 /** 33 /**
34 * Command to show the topology events metrics. 34 * Command to show the topology events metrics.
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Topology metrics command-line handlers. 18 * Topology metrics command-line handlers.
19 */ 19 */
20 -package org.onlab.onos.metrics.topology.cli;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.metrics.topology.cli;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * ONOS Topology Metrics Application that collects topology-related metrics. 18 * ONOS Topology Metrics Application that collects topology-related metrics.
19 */ 19 */
20 -package org.onlab.onos.metrics.topology; 20 +package org.onosproject.metrics.topology;
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 17
18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0"> 18 <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
19 <command> 19 <command>
20 - <action class="org.onlab.onos.metrics.topology.cli.TopologyEventsListCommand"/> 20 + <action class="org.onosproject.metrics.topology.cli.TopologyEventsListCommand"/>
21 </command> 21 </command>
22 <command> 22 <command>
23 - <action class="org.onlab.onos.metrics.topology.cli.TopologyEventsMetricsCommand"/> 23 + <action class="org.onosproject.metrics.topology.cli.TopologyEventsMetricsCommand"/>
24 </command> 24 </command>
25 </command-bundle> 25 </command-bundle>
26 26
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <artifactId>guava</artifactId> 37 <artifactId>guava</artifactId>
38 </dependency> 38 </dependency>
39 <dependency> 39 <dependency>
40 - <groupId>org.onlab.onos</groupId> 40 + <groupId>org.onosproject</groupId>
41 <artifactId>onlab-misc</artifactId> 41 <artifactId>onlab-misc</artifactId>
42 </dependency> 42 </dependency>
43 </dependencies> 43 </dependencies>
......
...@@ -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.onos.mobility; 16 +package org.onosproject.mobility;
17 import static org.slf4j.LoggerFactory.getLogger; 17 import static org.slf4j.LoggerFactory.getLogger;
18 18
19 import java.util.Collection; 19 import java.util.Collection;
...@@ -24,19 +24,19 @@ import org.apache.felix.scr.annotations.Component; ...@@ -24,19 +24,19 @@ import org.apache.felix.scr.annotations.Component;
24 import org.apache.felix.scr.annotations.Deactivate; 24 import org.apache.felix.scr.annotations.Deactivate;
25 import org.apache.felix.scr.annotations.Reference; 25 import org.apache.felix.scr.annotations.Reference;
26 import org.apache.felix.scr.annotations.ReferenceCardinality; 26 import org.apache.felix.scr.annotations.ReferenceCardinality;
27 -import org.onlab.onos.core.ApplicationId; 27 +import org.onosproject.core.ApplicationId;
28 -import org.onlab.onos.core.CoreService; 28 +import org.onosproject.core.CoreService;
29 -import org.onlab.onos.net.Device; 29 +import org.onosproject.net.Device;
30 -import org.onlab.onos.net.Host; 30 +import org.onosproject.net.Host;
31 -import org.onlab.onos.net.device.DeviceService; 31 +import org.onosproject.net.device.DeviceService;
32 -import org.onlab.onos.net.flow.FlowRule; 32 +import org.onosproject.net.flow.FlowRule;
33 -import org.onlab.onos.net.flow.FlowRuleService; 33 +import org.onosproject.net.flow.FlowRuleService;
34 -import org.onlab.onos.net.flow.criteria.Criteria.EthCriterion; 34 +import org.onosproject.net.flow.criteria.Criteria.EthCriterion;
35 -import org.onlab.onos.net.flow.criteria.Criterion; 35 +import org.onosproject.net.flow.criteria.Criterion;
36 -import org.onlab.onos.net.flow.criteria.Criterion.Type; 36 +import org.onosproject.net.flow.criteria.Criterion.Type;
37 -import org.onlab.onos.net.host.HostEvent; 37 +import org.onosproject.net.host.HostEvent;
38 -import org.onlab.onos.net.host.HostListener; 38 +import org.onosproject.net.host.HostListener;
39 -import org.onlab.onos.net.host.HostService; 39 +import org.onosproject.net.host.HostService;
40 import org.onlab.packet.MacAddress; 40 import org.onlab.packet.MacAddress;
41 import org.slf4j.Logger; 41 import org.slf4j.Logger;
42 42
...@@ -67,7 +67,7 @@ public class HostMobility { ...@@ -67,7 +67,7 @@ public class HostMobility {
67 67
68 @Activate 68 @Activate
69 public void activate() { 69 public void activate() {
70 - appId = coreService.registerApplication("org.onlab.onos.mobility"); 70 + appId = coreService.registerApplication("org.onosproject.mobility");
71 hostService.addListener(new InternalHostListener()); 71 hostService.addListener(new InternalHostListener());
72 log.info("Started with Application ID {}", appId.id()); 72 log.info("Started with Application ID {}", appId.id());
73 } 73 }
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Sample application that provides simple form of end-station host mobility. 18 * Sample application that provides simple form of end-station host mobility.
19 */ 19 */
20 -package org.onlab.onos.mobility; 20 +package org.onosproject.mobility;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 <transformers> 59 <transformers>
60 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> 60 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
61 <manifestEntries> 61 <manifestEntries>
62 - <Main-Class>org.onlab.onos.oecfg.OELinkConfig</Main-Class> 62 + <Main-Class>org.onosproject.oecfg.OELinkConfig</Main-Class>
63 </manifestEntries> 63 </manifestEntries>
64 </transformer> 64 </transformer>
65 </transformers> 65 </transformers>
......
...@@ -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.onos.oecfg; 16 +package org.onosproject.oecfg;
17 17
18 import com.fasterxml.jackson.databind.JsonNode; 18 import com.fasterxml.jackson.databind.JsonNode;
19 import com.fasterxml.jackson.databind.ObjectMapper; 19 import com.fasterxml.jackson.databind.ObjectMapper;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 <dependencies> 34 <dependencies>
35 35
36 <dependency> 36 <dependency>
37 - <groupId>org.onlab.onos</groupId> 37 + <groupId>org.onosproject</groupId>
38 <artifactId>onos-cli</artifactId> 38 <artifactId>onos-cli</artifactId>
39 <version>${project.version}</version> 39 <version>${project.version}</version>
40 </dependency> 40 </dependency>
......
...@@ -13,35 +13,35 @@ ...@@ -13,35 +13,35 @@
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.onos.optical; 16 +package org.onosproject.optical;
17 17
18 import org.apache.felix.scr.annotations.Activate; 18 import org.apache.felix.scr.annotations.Activate;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 import org.apache.felix.scr.annotations.Deactivate; 20 import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 21 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 22 import org.apache.felix.scr.annotations.ReferenceCardinality;
23 -import org.onlab.onos.net.ConnectPoint; 23 +import org.onosproject.net.ConnectPoint;
24 -import org.onlab.onos.net.Device; 24 +import org.onosproject.net.Device;
25 -import org.onlab.onos.net.DeviceId; 25 +import org.onosproject.net.DeviceId;
26 -import org.onlab.onos.net.Link; 26 +import org.onosproject.net.Link;
27 -import org.onlab.onos.net.Port; 27 +import org.onosproject.net.Port;
28 -import org.onlab.onos.net.device.DeviceEvent; 28 +import org.onosproject.net.device.DeviceEvent;
29 -import org.onlab.onos.net.device.DeviceListener; 29 +import org.onosproject.net.device.DeviceListener;
30 -import org.onlab.onos.net.device.DeviceService; 30 +import org.onosproject.net.device.DeviceService;
31 -import org.onlab.onos.net.link.DefaultLinkDescription; 31 +import org.onosproject.net.link.DefaultLinkDescription;
32 -import org.onlab.onos.net.link.LinkDescription; 32 +import org.onosproject.net.link.LinkDescription;
33 -import org.onlab.onos.net.link.LinkEvent; 33 +import org.onosproject.net.link.LinkEvent;
34 -import org.onlab.onos.net.link.LinkListener; 34 +import org.onosproject.net.link.LinkListener;
35 -import org.onlab.onos.net.link.LinkProvider; 35 +import org.onosproject.net.link.LinkProvider;
36 -import org.onlab.onos.net.link.LinkProviderRegistry; 36 +import org.onosproject.net.link.LinkProviderRegistry;
37 -import org.onlab.onos.net.link.LinkProviderService; 37 +import org.onosproject.net.link.LinkProviderService;
38 -import org.onlab.onos.net.link.LinkService; 38 +import org.onosproject.net.link.LinkService;
39 -import org.onlab.onos.net.provider.AbstractProvider; 39 +import org.onosproject.net.provider.AbstractProvider;
40 -import org.onlab.onos.net.provider.ProviderId; 40 +import org.onosproject.net.provider.ProviderId;
41 import org.slf4j.Logger; 41 import org.slf4j.Logger;
42 import org.slf4j.LoggerFactory; 42 import org.slf4j.LoggerFactory;
43 43
44 -import static org.onlab.onos.net.Link.Type.OPTICAL; 44 +import static org.onosproject.net.Link.Type.OPTICAL;
45 45
46 /** 46 /**
47 * Ancillary provider to activate/deactivate optical links as their respective 47 * Ancillary provider to activate/deactivate optical links as their respective
...@@ -66,7 +66,7 @@ public class OpticalLinkProvider extends AbstractProvider implements LinkProvide ...@@ -66,7 +66,7 @@ public class OpticalLinkProvider extends AbstractProvider implements LinkProvide
66 private LinkListener linkListener = new InternalLinkListener(); 66 private LinkListener linkListener = new InternalLinkListener();
67 67
68 public OpticalLinkProvider() { 68 public OpticalLinkProvider() {
69 - super(new ProviderId("optical", "org.onlab.onos.optical")); 69 + super(new ProviderId("optical", "org.onosproject.optical"));
70 } 70 }
71 71
72 @Activate 72 @Activate
......
...@@ -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.onos.optical; 16 +package org.onosproject.optical;
17 17
18 import com.google.common.collect.Lists; 18 import com.google.common.collect.Lists;
19 import org.apache.felix.scr.annotations.Activate; 19 import org.apache.felix.scr.annotations.Activate;
...@@ -21,25 +21,25 @@ import org.apache.felix.scr.annotations.Component; ...@@ -21,25 +21,25 @@ import org.apache.felix.scr.annotations.Component;
21 import org.apache.felix.scr.annotations.Deactivate; 21 import org.apache.felix.scr.annotations.Deactivate;
22 import org.apache.felix.scr.annotations.Reference; 22 import org.apache.felix.scr.annotations.Reference;
23 import org.apache.felix.scr.annotations.ReferenceCardinality; 23 import org.apache.felix.scr.annotations.ReferenceCardinality;
24 -import org.onlab.onos.core.ApplicationId; 24 +import org.onosproject.core.ApplicationId;
25 -import org.onlab.onos.core.CoreService; 25 +import org.onosproject.core.CoreService;
26 -import org.onlab.onos.net.ConnectPoint; 26 +import org.onosproject.net.ConnectPoint;
27 -import org.onlab.onos.net.Host; 27 +import org.onosproject.net.Host;
28 -import org.onlab.onos.net.Link; 28 +import org.onosproject.net.Link;
29 -import org.onlab.onos.net.Path; 29 +import org.onosproject.net.Path;
30 -import org.onlab.onos.net.host.HostService; 30 +import org.onosproject.net.host.HostService;
31 -import org.onlab.onos.net.intent.HostToHostIntent; 31 +import org.onosproject.net.intent.HostToHostIntent;
32 -import org.onlab.onos.net.intent.Intent; 32 +import org.onosproject.net.intent.Intent;
33 -import org.onlab.onos.net.intent.IntentEvent; 33 +import org.onosproject.net.intent.IntentEvent;
34 -import org.onlab.onos.net.intent.IntentListener; 34 +import org.onosproject.net.intent.IntentListener;
35 -import org.onlab.onos.net.intent.IntentOperations; 35 +import org.onosproject.net.intent.IntentOperations;
36 -import org.onlab.onos.net.intent.IntentService; 36 +import org.onosproject.net.intent.IntentService;
37 -import org.onlab.onos.net.intent.IntentState; 37 +import org.onosproject.net.intent.IntentState;
38 -import org.onlab.onos.net.intent.OpticalConnectivityIntent; 38 +import org.onosproject.net.intent.OpticalConnectivityIntent;
39 -import org.onlab.onos.net.intent.PointToPointIntent; 39 +import org.onosproject.net.intent.PointToPointIntent;
40 -import org.onlab.onos.net.topology.LinkWeight; 40 +import org.onosproject.net.topology.LinkWeight;
41 -import org.onlab.onos.net.topology.PathService; 41 +import org.onosproject.net.topology.PathService;
42 -import org.onlab.onos.net.topology.TopologyEdge; 42 +import org.onosproject.net.topology.TopologyEdge;
43 import org.slf4j.Logger; 43 import org.slf4j.Logger;
44 import org.slf4j.LoggerFactory; 44 import org.slf4j.LoggerFactory;
45 45
...@@ -81,7 +81,7 @@ public class OpticalPathProvisioner { ...@@ -81,7 +81,7 @@ public class OpticalPathProvisioner {
81 @Activate 81 @Activate
82 protected void activate() { 82 protected void activate() {
83 intentService.addListener(pathProvisioner); 83 intentService.addListener(pathProvisioner);
84 - appId = coreService.registerApplication("org.onlab.onos.optical"); 84 + appId = coreService.registerApplication("org.onosproject.optical");
85 log.info("Starting optical path provisoning..."); 85 log.info("Starting optical path provisoning...");
86 } 86 }
87 87
......
...@@ -13,31 +13,31 @@ ...@@ -13,31 +13,31 @@
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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 import org.codehaus.jackson.JsonNode; 18 import org.codehaus.jackson.JsonNode;
19 import org.codehaus.jackson.JsonParseException; 19 import org.codehaus.jackson.JsonParseException;
20 import org.codehaus.jackson.annotate.JsonIgnoreProperties; 20 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
21 import org.codehaus.jackson.map.JsonMappingException; 21 import org.codehaus.jackson.map.JsonMappingException;
22 import org.codehaus.jackson.map.ObjectMapper; 22 import org.codehaus.jackson.map.ObjectMapper;
23 -import org.onlab.onos.net.ConnectPoint; 23 +import org.onosproject.net.ConnectPoint;
24 -import org.onlab.onos.net.DefaultAnnotations; 24 +import org.onosproject.net.DefaultAnnotations;
25 -import org.onlab.onos.net.Device; 25 +import org.onosproject.net.Device;
26 -import org.onlab.onos.net.DeviceId; 26 +import org.onosproject.net.DeviceId;
27 -import org.onlab.onos.net.Link; 27 +import org.onosproject.net.Link;
28 -import org.onlab.onos.net.MastershipRole; 28 +import org.onosproject.net.MastershipRole;
29 -import org.onlab.onos.net.PortNumber; 29 +import org.onosproject.net.PortNumber;
30 -import org.onlab.onos.net.device.DefaultDeviceDescription; 30 +import org.onosproject.net.device.DefaultDeviceDescription;
31 -import org.onlab.onos.net.device.DeviceDescription; 31 +import org.onosproject.net.device.DeviceDescription;
32 -import org.onlab.onos.net.device.DeviceProvider; 32 +import org.onosproject.net.device.DeviceProvider;
33 -import org.onlab.onos.net.device.DeviceProviderRegistry; 33 +import org.onosproject.net.device.DeviceProviderRegistry;
34 -import org.onlab.onos.net.device.DeviceProviderService; 34 +import org.onosproject.net.device.DeviceProviderService;
35 -import org.onlab.onos.net.link.DefaultLinkDescription; 35 +import org.onosproject.net.link.DefaultLinkDescription;
36 -import org.onlab.onos.net.link.LinkProvider; 36 +import org.onosproject.net.link.LinkProvider;
37 -import org.onlab.onos.net.link.LinkProviderRegistry; 37 +import org.onosproject.net.link.LinkProviderRegistry;
38 -import org.onlab.onos.net.link.LinkProviderService; 38 +import org.onosproject.net.link.LinkProviderService;
39 -import org.onlab.onos.net.provider.AbstractProvider; 39 +import org.onosproject.net.provider.AbstractProvider;
40 -import org.onlab.onos.net.provider.ProviderId; 40 +import org.onosproject.net.provider.ProviderId;
41 import org.onlab.packet.ChassisId; 41 import org.onlab.packet.ChassisId;
42 import org.slf4j.Logger; 42 import org.slf4j.Logger;
43 import org.slf4j.LoggerFactory; 43 import org.slf4j.LoggerFactory;
...@@ -50,7 +50,7 @@ import java.util.List; ...@@ -50,7 +50,7 @@ import java.util.List;
50 import java.util.Map; 50 import java.util.Map;
51 import java.util.Set; 51 import java.util.Set;
52 52
53 -import static org.onlab.onos.net.DeviceId.deviceId; 53 +import static org.onosproject.net.DeviceId.deviceId;
54 54
55 /** 55 /**
56 * OpticalConfigProvider emulates the SB network provider for optical switches, 56 * OpticalConfigProvider emulates the SB network provider for optical switches,
...@@ -93,7 +93,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro ...@@ -93,7 +93,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
93 protected OpticalNetworkConfig opticalNetworkConfig; 93 protected OpticalNetworkConfig opticalNetworkConfig;
94 94
95 public OpticalConfigProvider() { 95 public OpticalConfigProvider() {
96 - super(new ProviderId("optical", "org.onlab.onos.provider" + 96 + super(new ProviderId("optical", "org.onosproject.provider" +
97 ".opticalConfig")); 97 ".opticalConfig"));
98 } 98 }
99 99
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 import java.util.Map; 18 import java.util.Map;
19 import org.codehaus.jackson.JsonNode; 19 import org.codehaus.jackson.JsonNode;
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 import java.util.ArrayList; 18 import java.util.ArrayList;
19 import java.util.List; 19 import java.util.List;
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 import java.util.Map; 18 import java.util.Map;
19 import org.codehaus.jackson.JsonNode; 19 import org.codehaus.jackson.JsonNode;
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 /** 18 /**
19 * Packet-optical link Java data object. 19 * Packet-optical link Java data object.
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 /** 18 /**
19 * ROADM java data object converted from a JSON file. 19 * ROADM java data object converted from a JSON file.
......
...@@ -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.onos.optical.cfg; 16 +package org.onosproject.optical.cfg;
17 17
18 /** 18 /**
19 * WDM Link Java data object converted from a JSON file. 19 * WDM Link Java data object converted from a JSON file.
......
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
18 * Packet/Optical configuration. 18 * Packet/Optical configuration.
19 */ 19 */
20 @Deprecated 20 @Deprecated
21 -package org.onlab.onos.optical.cfg;
...\ No newline at end of file ...\ No newline at end of file
21 +package org.onosproject.optical.cfg;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Packet/Optical application. 18 * Packet/Optical application.
19 */ 19 */
20 -package org.onlab.onos.optical;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.optical;
......
...@@ -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.onos.optical.testapp; 16 +package org.onosproject.optical.testapp;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -24,21 +24,21 @@ import org.apache.felix.scr.annotations.Activate; ...@@ -24,21 +24,21 @@ import org.apache.felix.scr.annotations.Activate;
24 import org.apache.felix.scr.annotations.Deactivate; 24 import org.apache.felix.scr.annotations.Deactivate;
25 import org.apache.felix.scr.annotations.Reference; 25 import org.apache.felix.scr.annotations.Reference;
26 import org.apache.felix.scr.annotations.ReferenceCardinality; 26 import org.apache.felix.scr.annotations.ReferenceCardinality;
27 -import org.onlab.onos.core.ApplicationId; 27 +import org.onosproject.core.ApplicationId;
28 -import org.onlab.onos.core.CoreService; 28 +import org.onosproject.core.CoreService;
29 -import org.onlab.onos.net.Device; 29 +import org.onosproject.net.Device;
30 -import org.onlab.onos.net.DeviceId; 30 +import org.onosproject.net.DeviceId;
31 -import org.onlab.onos.net.PortNumber; 31 +import org.onosproject.net.PortNumber;
32 -import org.onlab.onos.net.device.DeviceEvent; 32 +import org.onosproject.net.device.DeviceEvent;
33 -import org.onlab.onos.net.device.DeviceListener; 33 +import org.onosproject.net.device.DeviceListener;
34 -import org.onlab.onos.net.device.DeviceService; 34 +import org.onosproject.net.device.DeviceService;
35 -import org.onlab.onos.net.flow.DefaultFlowRule; 35 +import org.onosproject.net.flow.DefaultFlowRule;
36 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 36 +import org.onosproject.net.flow.DefaultTrafficSelector;
37 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 37 +import org.onosproject.net.flow.DefaultTrafficTreatment;
38 -import org.onlab.onos.net.flow.FlowRule; 38 +import org.onosproject.net.flow.FlowRule;
39 -import org.onlab.onos.net.flow.FlowRuleService; 39 +import org.onosproject.net.flow.FlowRuleService;
40 -import org.onlab.onos.net.flow.TrafficSelector; 40 +import org.onosproject.net.flow.TrafficSelector;
41 -import org.onlab.onos.net.flow.TrafficTreatment; 41 +import org.onosproject.net.flow.TrafficTreatment;
42 import org.slf4j.Logger; 42 import org.slf4j.Logger;
43 43
44 /** 44 /**
...@@ -66,7 +66,7 @@ public class LambdaForwarding { ...@@ -66,7 +66,7 @@ public class LambdaForwarding {
66 66
67 @Activate 67 @Activate
68 public void activate() { 68 public void activate() {
69 - appId = coreService.registerApplication("org.onlab.onos.fwd"); 69 + appId = coreService.registerApplication("org.onosproject.fwd");
70 70
71 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1); 71 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
72 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2); 72 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
......
...@@ -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.onos.optical.testapp; 16 +package org.onosproject.optical.testapp;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -24,21 +24,21 @@ import org.apache.felix.scr.annotations.Activate; ...@@ -24,21 +24,21 @@ import org.apache.felix.scr.annotations.Activate;
24 import org.apache.felix.scr.annotations.Deactivate; 24 import org.apache.felix.scr.annotations.Deactivate;
25 import org.apache.felix.scr.annotations.Reference; 25 import org.apache.felix.scr.annotations.Reference;
26 import org.apache.felix.scr.annotations.ReferenceCardinality; 26 import org.apache.felix.scr.annotations.ReferenceCardinality;
27 -import org.onlab.onos.core.ApplicationId; 27 +import org.onosproject.core.ApplicationId;
28 -import org.onlab.onos.core.CoreService; 28 +import org.onosproject.core.CoreService;
29 -import org.onlab.onos.net.Device; 29 +import org.onosproject.net.Device;
30 -import org.onlab.onos.net.DeviceId; 30 +import org.onosproject.net.DeviceId;
31 -import org.onlab.onos.net.PortNumber; 31 +import org.onosproject.net.PortNumber;
32 -import org.onlab.onos.net.device.DeviceEvent; 32 +import org.onosproject.net.device.DeviceEvent;
33 -import org.onlab.onos.net.device.DeviceListener; 33 +import org.onosproject.net.device.DeviceListener;
34 -import org.onlab.onos.net.device.DeviceService; 34 +import org.onosproject.net.device.DeviceService;
35 -import org.onlab.onos.net.flow.DefaultFlowRule; 35 +import org.onosproject.net.flow.DefaultFlowRule;
36 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 36 +import org.onosproject.net.flow.DefaultTrafficSelector;
37 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 37 +import org.onosproject.net.flow.DefaultTrafficTreatment;
38 -import org.onlab.onos.net.flow.FlowRule; 38 +import org.onosproject.net.flow.FlowRule;
39 -import org.onlab.onos.net.flow.FlowRuleService; 39 +import org.onosproject.net.flow.FlowRuleService;
40 -import org.onlab.onos.net.flow.TrafficSelector; 40 +import org.onosproject.net.flow.TrafficSelector;
41 -import org.onlab.onos.net.flow.TrafficTreatment; 41 +import org.onosproject.net.flow.TrafficTreatment;
42 import org.onlab.packet.Ethernet; 42 import org.onlab.packet.Ethernet;
43 import org.slf4j.Logger; 43 import org.slf4j.Logger;
44 44
...@@ -67,7 +67,7 @@ public class MPLSForwarding { ...@@ -67,7 +67,7 @@ public class MPLSForwarding {
67 67
68 @Activate 68 @Activate
69 public void activate() { 69 public void activate() {
70 - appId = coreService.registerApplication("org.onlab.onos.testapp" + 70 + appId = coreService.registerApplication("org.onosproject.testapp" +
71 ".mplsfwd"); 71 ".mplsfwd");
72 72
73 uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1); 73 uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1);
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Packet/Optical sample forwarding applications. 18 * Packet/Optical sample forwarding applications.
19 */ 19 */
20 -package org.onlab.onos.optical.testapp;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.optical.testapp;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos</artifactId> 24 <artifactId>onos</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -53,12 +53,12 @@ ...@@ -53,12 +53,12 @@
53 53
54 <dependencies> 54 <dependencies>
55 <dependency> 55 <dependency>
56 - <groupId>org.onlab.onos</groupId> 56 + <groupId>org.onosproject</groupId>
57 <artifactId>onos-api</artifactId> 57 <artifactId>onos-api</artifactId>
58 </dependency> 58 </dependency>
59 59
60 <dependency> 60 <dependency>
61 - <groupId>org.onlab.onos</groupId> 61 + <groupId>org.onosproject</groupId>
62 <artifactId>onlab-osgi</artifactId> 62 <artifactId>onlab-osgi</artifactId>
63 <version>${project.version}</version> 63 <version>${project.version}</version>
64 </dependency> 64 </dependency>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
......
...@@ -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.onos.proxyarp; 16 +package org.onosproject.proxyarp;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -22,12 +22,12 @@ import org.apache.felix.scr.annotations.Component; ...@@ -22,12 +22,12 @@ import org.apache.felix.scr.annotations.Component;
22 import org.apache.felix.scr.annotations.Deactivate; 22 import org.apache.felix.scr.annotations.Deactivate;
23 import org.apache.felix.scr.annotations.Reference; 23 import org.apache.felix.scr.annotations.Reference;
24 import org.apache.felix.scr.annotations.ReferenceCardinality; 24 import org.apache.felix.scr.annotations.ReferenceCardinality;
25 -import org.onlab.onos.core.ApplicationId; 25 +import org.onosproject.core.ApplicationId;
26 -import org.onlab.onos.core.CoreService; 26 +import org.onosproject.core.CoreService;
27 -import org.onlab.onos.net.packet.PacketContext; 27 +import org.onosproject.net.packet.PacketContext;
28 -import org.onlab.onos.net.packet.PacketProcessor; 28 +import org.onosproject.net.packet.PacketProcessor;
29 -import org.onlab.onos.net.packet.PacketService; 29 +import org.onosproject.net.packet.PacketService;
30 -import org.onlab.onos.net.proxyarp.ProxyArpService; 30 +import org.onosproject.net.proxyarp.ProxyArpService;
31 import org.slf4j.Logger; 31 import org.slf4j.Logger;
32 32
33 /** 33 /**
...@@ -54,7 +54,7 @@ public class ProxyArp { ...@@ -54,7 +54,7 @@ public class ProxyArp {
54 54
55 @Activate 55 @Activate
56 public void activate() { 56 public void activate() {
57 - appId = coreService.registerApplication("org.onlab.onos.proxyarp"); 57 + appId = coreService.registerApplication("org.onosproject.proxyarp");
58 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 1); 58 packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 1);
59 log.info("Started with Application ID {}", appId.id()); 59 log.info("Started with Application ID {}", appId.id());
60 } 60 }
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Proxy Arp application that handles arp resolution for you. 18 * Proxy Arp application that handles arp resolution for you.
19 */ 19 */
20 -package org.onlab.onos.proxyarp; 20 +package org.onosproject.proxyarp;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 21
22 <parent> 22 <parent>
23 - <groupId>org.onlab.onos</groupId> 23 + <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 <version>1.0.0-SNAPSHOT</version> 25 <version>1.0.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
...@@ -55,23 +55,23 @@ ...@@ -55,23 +55,23 @@
55 </dependency> 55 </dependency>
56 56
57 <dependency> 57 <dependency>
58 - <groupId>org.onlab.onos</groupId> 58 + <groupId>org.onosproject</groupId>
59 <artifactId>onlab-thirdparty</artifactId> 59 <artifactId>onlab-thirdparty</artifactId>
60 </dependency> 60 </dependency>
61 61
62 <dependency> 62 <dependency>
63 - <groupId>org.onlab.onos</groupId> 63 + <groupId>org.onosproject</groupId>
64 <artifactId>onlab-misc</artifactId> 64 <artifactId>onlab-misc</artifactId>
65 </dependency> 65 </dependency>
66 66
67 <dependency> 67 <dependency>
68 - <groupId>org.onlab.onos</groupId> 68 + <groupId>org.onosproject</groupId>
69 <artifactId>onlab-junit</artifactId> 69 <artifactId>onlab-junit</artifactId>
70 <scope>test</scope> 70 <scope>test</scope>
71 </dependency> 71 </dependency>
72 72
73 <dependency> 73 <dependency>
74 - <groupId>org.onlab.onos</groupId> 74 + <groupId>org.onosproject</groupId>
75 <artifactId>onos-api</artifactId> 75 <artifactId>onos-api</artifactId>
76 <version>${project.version}</version> 76 <version>${project.version}</version>
77 <scope>test</scope> 77 <scope>test</scope>
...@@ -79,13 +79,13 @@ ...@@ -79,13 +79,13 @@
79 </dependency> 79 </dependency>
80 80
81 <dependency> 81 <dependency>
82 - <groupId>org.onlab.onos</groupId> 82 + <groupId>org.onosproject</groupId>
83 <artifactId>onos-cli</artifactId> 83 <artifactId>onos-cli</artifactId>
84 <version>${project.version}</version> 84 <version>${project.version}</version>
85 </dependency> 85 </dependency>
86 86
87 <dependency> 87 <dependency>
88 - <groupId>org.onlab.onos</groupId> 88 + <groupId>org.onosproject</groupId>
89 <artifactId>onos-core-dist</artifactId> 89 <artifactId>onos-core-dist</artifactId>
90 <version>${project.version}</version> 90 <version>${project.version}</version>
91 </dependency> 91 </dependency>
......
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 19
20 import java.util.Set; 20 import java.util.Set;
21 21
22 -import org.onlab.onos.net.ConnectPoint; 22 +import org.onosproject.net.ConnectPoint;
23 -import org.onlab.onos.net.host.HostService; 23 +import org.onosproject.net.host.HostService;
24 -import org.onlab.onos.net.host.InterfaceIpAddress; 24 +import org.onosproject.net.host.InterfaceIpAddress;
25 -import org.onlab.onos.net.host.PortAddresses; 25 +import org.onosproject.net.host.PortAddresses;
26 -import org.onlab.onos.sdnip.config.Interface; 26 +import org.onosproject.sdnip.config.Interface;
27 import org.onlab.packet.IpAddress; 27 import org.onlab.packet.IpAddress;
28 28
29 import com.google.common.collect.Sets; 29 import com.google.common.collect.Sets;
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 import java.util.HashMap; 19 import java.util.HashMap;
...@@ -27,15 +27,15 @@ import java.util.concurrent.Executors; ...@@ -27,15 +27,15 @@ import java.util.concurrent.Executors;
27 import java.util.concurrent.Semaphore; 27 import java.util.concurrent.Semaphore;
28 28
29 import org.apache.commons.lang3.tuple.Pair; 29 import org.apache.commons.lang3.tuple.Pair;
30 -import org.onlab.onos.core.ApplicationId; 30 +import org.onosproject.core.ApplicationId;
31 -import org.onlab.onos.net.flow.criteria.Criteria.IPCriterion; 31 +import org.onosproject.net.flow.criteria.Criteria.IPCriterion;
32 -import org.onlab.onos.net.flow.criteria.Criterion; 32 +import org.onosproject.net.flow.criteria.Criterion;
33 -import org.onlab.onos.net.intent.Intent; 33 +import org.onosproject.net.intent.Intent;
34 -import org.onlab.onos.net.intent.IntentOperations; 34 +import org.onosproject.net.intent.IntentOperations;
35 -import org.onlab.onos.net.intent.IntentService; 35 +import org.onosproject.net.intent.IntentService;
36 -import org.onlab.onos.net.intent.IntentState; 36 +import org.onosproject.net.intent.IntentState;
37 -import org.onlab.onos.net.intent.MultiPointToSinglePointIntent; 37 +import org.onosproject.net.intent.MultiPointToSinglePointIntent;
38 -import org.onlab.onos.net.intent.PointToPointIntent; 38 +import org.onosproject.net.intent.PointToPointIntent;
39 import org.onlab.packet.Ip4Prefix; 39 import org.onlab.packet.Ip4Prefix;
40 import org.slf4j.Logger; 40 import org.slf4j.Logger;
41 import org.slf4j.LoggerFactory; 41 import org.slf4j.LoggerFactory;
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.Set; 18 import java.util.Set;
19 19
20 -import org.onlab.onos.net.ConnectPoint; 20 +import org.onosproject.net.ConnectPoint;
21 -import org.onlab.onos.sdnip.config.Interface; 21 +import org.onosproject.sdnip.config.Interface;
22 import org.onlab.packet.IpAddress; 22 import org.onlab.packet.IpAddress;
23 23
24 /** 24 /**
......
...@@ -13,25 +13,25 @@ ...@@ -13,25 +13,25 @@
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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.ArrayList; 18 import java.util.ArrayList;
19 import java.util.Collection; 19 import java.util.Collection;
20 import java.util.List; 20 import java.util.List;
21 21
22 -import org.onlab.onos.core.ApplicationId; 22 +import org.onosproject.core.ApplicationId;
23 -import org.onlab.onos.net.ConnectPoint; 23 +import org.onosproject.net.ConnectPoint;
24 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 24 +import org.onosproject.net.flow.DefaultTrafficSelector;
25 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 25 +import org.onosproject.net.flow.DefaultTrafficTreatment;
26 -import org.onlab.onos.net.flow.TrafficSelector; 26 +import org.onosproject.net.flow.TrafficSelector;
27 -import org.onlab.onos.net.flow.TrafficTreatment; 27 +import org.onosproject.net.flow.TrafficTreatment;
28 -import org.onlab.onos.net.intent.PointToPointIntent; 28 +import org.onosproject.net.intent.PointToPointIntent;
29 -import org.onlab.onos.sdnip.bgp.BgpConstants; 29 +import org.onosproject.sdnip.bgp.BgpConstants;
30 -import org.onlab.onos.sdnip.config.BgpPeer; 30 +import org.onosproject.sdnip.config.BgpPeer;
31 -import org.onlab.onos.sdnip.config.BgpSpeaker; 31 +import org.onosproject.sdnip.config.BgpSpeaker;
32 -import org.onlab.onos.sdnip.config.Interface; 32 +import org.onosproject.sdnip.config.Interface;
33 -import org.onlab.onos.sdnip.config.InterfaceAddress; 33 +import org.onosproject.sdnip.config.InterfaceAddress;
34 -import org.onlab.onos.sdnip.config.SdnIpConfigurationService; 34 +import org.onosproject.sdnip.config.SdnIpConfigurationService;
35 import org.onlab.packet.Ethernet; 35 import org.onlab.packet.Ethernet;
36 import org.onlab.packet.IPv4; 36 import org.onlab.packet.IPv4;
37 import org.onlab.packet.IpAddress; 37 import org.onlab.packet.IpAddress;
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 19
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 19
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 19
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 import java.util.HashSet; 19 import java.util.HashSet;
...@@ -29,20 +29,20 @@ import java.util.concurrent.Executors; ...@@ -29,20 +29,20 @@ import java.util.concurrent.Executors;
29 import java.util.concurrent.LinkedBlockingQueue; 29 import java.util.concurrent.LinkedBlockingQueue;
30 30
31 import org.apache.commons.lang3.tuple.Pair; 31 import org.apache.commons.lang3.tuple.Pair;
32 -import org.onlab.onos.core.ApplicationId; 32 +import org.onosproject.core.ApplicationId;
33 -import org.onlab.onos.net.ConnectPoint; 33 +import org.onosproject.net.ConnectPoint;
34 -import org.onlab.onos.net.Host; 34 +import org.onosproject.net.Host;
35 -import org.onlab.onos.net.flow.DefaultTrafficSelector; 35 +import org.onosproject.net.flow.DefaultTrafficSelector;
36 -import org.onlab.onos.net.flow.DefaultTrafficTreatment; 36 +import org.onosproject.net.flow.DefaultTrafficTreatment;
37 -import org.onlab.onos.net.flow.TrafficSelector; 37 +import org.onosproject.net.flow.TrafficSelector;
38 -import org.onlab.onos.net.flow.TrafficTreatment; 38 +import org.onosproject.net.flow.TrafficTreatment;
39 -import org.onlab.onos.net.host.HostEvent; 39 +import org.onosproject.net.host.HostEvent;
40 -import org.onlab.onos.net.host.HostListener; 40 +import org.onosproject.net.host.HostListener;
41 -import org.onlab.onos.net.host.HostService; 41 +import org.onosproject.net.host.HostService;
42 -import org.onlab.onos.net.intent.MultiPointToSinglePointIntent; 42 +import org.onosproject.net.intent.MultiPointToSinglePointIntent;
43 -import org.onlab.onos.sdnip.config.BgpPeer; 43 +import org.onosproject.sdnip.config.BgpPeer;
44 -import org.onlab.onos.sdnip.config.Interface; 44 +import org.onosproject.sdnip.config.Interface;
45 -import org.onlab.onos.sdnip.config.SdnIpConfigurationService; 45 +import org.onosproject.sdnip.config.SdnIpConfigurationService;
46 import org.onlab.packet.Ethernet; 46 import org.onlab.packet.Ethernet;
47 import org.onlab.packet.IpAddress; 47 import org.onlab.packet.IpAddress;
48 import org.onlab.packet.Ip4Address; 48 import org.onlab.packet.Ip4Address;
......
...@@ -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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import static org.slf4j.LoggerFactory.getLogger; 18 import static org.slf4j.LoggerFactory.getLogger;
19 19
...@@ -25,19 +25,19 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -25,19 +25,19 @@ import org.apache.felix.scr.annotations.Deactivate;
25 import org.apache.felix.scr.annotations.Reference; 25 import org.apache.felix.scr.annotations.Reference;
26 import org.apache.felix.scr.annotations.ReferenceCardinality; 26 import org.apache.felix.scr.annotations.ReferenceCardinality;
27 import org.apache.felix.scr.annotations.Service; 27 import org.apache.felix.scr.annotations.Service;
28 -import org.onlab.onos.cluster.ClusterService; 28 +import org.onosproject.cluster.ClusterService;
29 -import org.onlab.onos.cluster.ControllerNode; 29 +import org.onosproject.cluster.ControllerNode;
30 -import org.onlab.onos.cluster.LeadershipEvent; 30 +import org.onosproject.cluster.LeadershipEvent;
31 -import org.onlab.onos.cluster.LeadershipEventListener; 31 +import org.onosproject.cluster.LeadershipEventListener;
32 -import org.onlab.onos.cluster.LeadershipService; 32 +import org.onosproject.cluster.LeadershipService;
33 -import org.onlab.onos.core.ApplicationId; 33 +import org.onosproject.core.ApplicationId;
34 -import org.onlab.onos.core.CoreService; 34 +import org.onosproject.core.CoreService;
35 -import org.onlab.onos.net.host.HostService; 35 +import org.onosproject.net.host.HostService;
36 -import org.onlab.onos.net.intent.IntentService; 36 +import org.onosproject.net.intent.IntentService;
37 -import org.onlab.onos.sdnip.bgp.BgpRouteEntry; 37 +import org.onosproject.sdnip.bgp.BgpRouteEntry;
38 -import org.onlab.onos.sdnip.bgp.BgpSession; 38 +import org.onosproject.sdnip.bgp.BgpSession;
39 -import org.onlab.onos.sdnip.bgp.BgpSessionManager; 39 +import org.onosproject.sdnip.bgp.BgpSessionManager;
40 -import org.onlab.onos.sdnip.config.SdnIpConfigurationReader; 40 +import org.onosproject.sdnip.config.SdnIpConfigurationReader;
41 import org.slf4j.Logger; 41 import org.slf4j.Logger;
42 42
43 /** 43 /**
...@@ -47,7 +47,7 @@ import org.slf4j.Logger; ...@@ -47,7 +47,7 @@ import org.slf4j.Logger;
47 @Service 47 @Service
48 public class SdnIp implements SdnIpService { 48 public class SdnIp implements SdnIpService {
49 49
50 - private static final String SDN_IP_APP = "org.onlab.onos.sdnip"; 50 + private static final String SDN_IP_APP = "org.onosproject.sdnip";
51 // NOTE: Must be 5s for now 51 // NOTE: Must be 5s for now
52 private static final int LEASE_DURATION_MS = 5 * 1000; 52 private static final int LEASE_DURATION_MS = 5 * 1000;
53 private static final int LEASE_EXTEND_RETRY_MAX = 3; 53 private static final int LEASE_EXTEND_RETRY_MAX = 3;
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
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.onos.sdnip; 16 +package org.onosproject.sdnip;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 19
20 -import org.onlab.onos.sdnip.bgp.BgpRouteEntry; 20 +import org.onosproject.sdnip.bgp.BgpRouteEntry;
21 -import org.onlab.onos.sdnip.bgp.BgpSession; 21 +import org.onosproject.sdnip.bgp.BgpSession;
22 22
23 /** 23 /**
24 * Service interface exported by SDN-IP. 24 * Service interface exported by SDN-IP.
......
...@@ -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.onos.sdnip.bgp; 16 +package org.onosproject.sdnip.bgp;
17 17
18 /** 18 /**
19 * BGP related constants. 19 * BGP related constants.
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
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.onos.sdnip.bgp; 16 +package org.onosproject.sdnip.bgp;
17 17
18 import org.jboss.netty.buffer.ChannelBuffer; 18 import org.jboss.netty.buffer.ChannelBuffer;
19 import org.jboss.netty.buffer.ChannelBuffers; 19 import org.jboss.netty.buffer.ChannelBuffers;
20 import org.jboss.netty.channel.Channel; 20 import org.jboss.netty.channel.Channel;
21 import org.jboss.netty.channel.ChannelHandlerContext; 21 import org.jboss.netty.channel.ChannelHandlerContext;
22 import org.jboss.netty.handler.codec.frame.FrameDecoder; 22 import org.jboss.netty.handler.codec.frame.FrameDecoder;
23 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications.MessageHeaderError; 23 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications.MessageHeaderError;
24 import org.slf4j.Logger; 24 import org.slf4j.Logger;
25 import org.slf4j.LoggerFactory; 25 import org.slf4j.LoggerFactory;
26 26
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
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.onos.sdnip.bgp; 16 +package org.onosproject.sdnip.bgp;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 19
20 import java.util.ArrayList; 20 import java.util.ArrayList;
21 import java.util.Objects; 21 import java.util.Objects;
22 22
23 -import org.onlab.onos.sdnip.RouteEntry; 23 +import org.onosproject.sdnip.RouteEntry;
24 -import org.onlab.onos.sdnip.bgp.BgpConstants.Update; 24 +import org.onosproject.sdnip.bgp.BgpConstants.Update;
25 import org.onlab.packet.Ip4Address; 25 import org.onlab.packet.Ip4Address;
26 import org.onlab.packet.Ip4Prefix; 26 import org.onlab.packet.Ip4Prefix;
27 27
......
...@@ -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.onos.sdnip.bgp; 16 +package org.onosproject.sdnip.bgp;
17 17
18 import java.net.InetAddress; 18 import java.net.InetAddress;
19 import java.net.InetSocketAddress; 19 import java.net.InetSocketAddress;
...@@ -37,11 +37,11 @@ import org.jboss.netty.util.HashedWheelTimer; ...@@ -37,11 +37,11 @@ import org.jboss.netty.util.HashedWheelTimer;
37 import org.jboss.netty.util.Timeout; 37 import org.jboss.netty.util.Timeout;
38 import org.jboss.netty.util.Timer; 38 import org.jboss.netty.util.Timer;
39 import org.jboss.netty.util.TimerTask; 39 import org.jboss.netty.util.TimerTask;
40 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications; 40 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications;
41 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications.HoldTimerExpired; 41 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications.HoldTimerExpired;
42 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications.MessageHeaderError; 42 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications.MessageHeaderError;
43 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications.OpenMessageError; 43 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications.OpenMessageError;
44 -import org.onlab.onos.sdnip.bgp.BgpConstants.Notifications.UpdateMessageError; 44 +import org.onosproject.sdnip.bgp.BgpConstants.Notifications.UpdateMessageError;
45 import org.onlab.packet.Ip4Address; 45 import org.onlab.packet.Ip4Address;
46 import org.onlab.packet.Ip4Prefix; 46 import org.onlab.packet.Ip4Prefix;
47 import org.slf4j.Logger; 47 import org.slf4j.Logger;
......
...@@ -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.onos.sdnip.bgp; 16 +package org.onosproject.sdnip.bgp;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 import static org.onlab.util.Tools.namedThreads; 19 import static org.onlab.util.Tools.namedThreads;
...@@ -37,8 +37,8 @@ import org.jboss.netty.channel.Channels; ...@@ -37,8 +37,8 @@ import org.jboss.netty.channel.Channels;
37 import org.jboss.netty.channel.group.ChannelGroup; 37 import org.jboss.netty.channel.group.ChannelGroup;
38 import org.jboss.netty.channel.group.DefaultChannelGroup; 38 import org.jboss.netty.channel.group.DefaultChannelGroup;
39 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; 39 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
40 -import org.onlab.onos.sdnip.RouteListener; 40 +import org.onosproject.sdnip.RouteListener;
41 -import org.onlab.onos.sdnip.RouteUpdate; 41 +import org.onosproject.sdnip.RouteUpdate;
42 import org.onlab.packet.Ip4Address; 42 import org.onlab.packet.Ip4Address;
43 import org.onlab.packet.Ip4Prefix; 43 import org.onlab.packet.Ip4Prefix;
44 import org.slf4j.Logger; 44 import org.slf4j.Logger;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Implementation of the BGP protocol. 18 * Implementation of the BGP protocol.
19 */ 19 */
20 -package org.onlab.onos.sdnip.bgp;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.sdnip.bgp;
......
...@@ -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.onos.sdnip.cli; 16 +package org.onosproject.sdnip.cli;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 19
...@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode; ...@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
23 import com.fasterxml.jackson.databind.node.ObjectNode; 23 import com.fasterxml.jackson.databind.node.ObjectNode;
24 import org.apache.karaf.shell.commands.Command; 24 import org.apache.karaf.shell.commands.Command;
25 import org.apache.karaf.shell.commands.Option; 25 import org.apache.karaf.shell.commands.Option;
26 -import org.onlab.onos.cli.AbstractShellCommand; 26 +import org.onosproject.cli.AbstractShellCommand;
27 -import org.onlab.onos.sdnip.SdnIpService; 27 +import org.onosproject.sdnip.SdnIpService;
28 -import org.onlab.onos.sdnip.bgp.BgpSession; 28 +import org.onosproject.sdnip.bgp.BgpSession;
29 29
30 /** 30 /**
31 * Command to show the BGP neighbors. 31 * Command to show the BGP neighbors.
......
...@@ -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.onos.sdnip.cli; 16 +package org.onosproject.sdnip.cli;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 19
...@@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode; ...@@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
23 import com.fasterxml.jackson.databind.node.ObjectNode; 23 import com.fasterxml.jackson.databind.node.ObjectNode;
24 import org.apache.karaf.shell.commands.Command; 24 import org.apache.karaf.shell.commands.Command;
25 import org.apache.karaf.shell.commands.Option; 25 import org.apache.karaf.shell.commands.Option;
26 -import org.onlab.onos.cli.AbstractShellCommand; 26 +import org.onosproject.cli.AbstractShellCommand;
27 -import org.onlab.onos.sdnip.SdnIpService; 27 +import org.onosproject.sdnip.SdnIpService;
28 -import org.onlab.onos.sdnip.bgp.BgpConstants.Update.AsPath; 28 +import org.onosproject.sdnip.bgp.BgpConstants.Update.AsPath;
29 -import org.onlab.onos.sdnip.bgp.BgpConstants.Update.Origin; 29 +import org.onosproject.sdnip.bgp.BgpConstants.Update.Origin;
30 -import org.onlab.onos.sdnip.bgp.BgpRouteEntry; 30 +import org.onosproject.sdnip.bgp.BgpRouteEntry;
31 31
32 /** 32 /**
33 * Command to show the routes learned through BGP. 33 * Command to show the routes learned through BGP.
......
1 -package org.onlab.onos.sdnip.cli; 1 +package org.onosproject.sdnip.cli;
2 2
3 import org.apache.karaf.shell.commands.Argument; 3 import org.apache.karaf.shell.commands.Argument;
4 import org.apache.karaf.shell.commands.Command; 4 import org.apache.karaf.shell.commands.Command;
5 -import org.onlab.onos.cli.AbstractShellCommand; 5 +import org.onosproject.cli.AbstractShellCommand;
6 -import org.onlab.onos.sdnip.SdnIpService; 6 +import org.onosproject.sdnip.SdnIpService;
7 7
8 /** 8 /**
9 * Command to change whether this SDNIP instance is primary or not. 9 * Command to change whether this SDNIP instance is primary or not.
......
...@@ -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.onos.sdnip.cli; 16 +package org.onosproject.sdnip.cli;
17 17
18 import java.util.Collection; 18 import java.util.Collection;
19 19
...@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode; ...@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
23 import com.fasterxml.jackson.databind.node.ObjectNode; 23 import com.fasterxml.jackson.databind.node.ObjectNode;
24 import org.apache.karaf.shell.commands.Command; 24 import org.apache.karaf.shell.commands.Command;
25 import org.apache.karaf.shell.commands.Option; 25 import org.apache.karaf.shell.commands.Option;
26 -import org.onlab.onos.cli.AbstractShellCommand; 26 +import org.onosproject.cli.AbstractShellCommand;
27 -import org.onlab.onos.sdnip.RouteEntry; 27 +import org.onosproject.sdnip.RouteEntry;
28 -import org.onlab.onos.sdnip.SdnIpService; 28 +import org.onosproject.sdnip.SdnIpService;
29 29
30 /** 30 /**
31 * Command to show the list of routes in SDN-IP's routing table. 31 * Command to show the list of routes in SDN-IP's routing table.
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * SDN-IP command-line handlers. 18 * SDN-IP command-line handlers.
19 */ 19 */
20 -package org.onlab.onos.sdnip.cli;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.sdnip.cli;
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.