홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
e2dc27a0 1 parent 14ab7327

Moved net to core

Inline Side-by-side
Showing 139 changed files with 8 additions and 35 deletions
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 6
7 <parent> 7 <parent>
8 <groupId>org.onlab.onos</groupId> 8 <groupId>org.onlab.onos</groupId>
9 - <artifactId>onos-net</artifactId> 9 + <artifactId>onos-core</artifactId>
10 <version>1.0.0-SNAPSHOT</version> 10 <version>1.0.0-SNAPSHOT</version>
11 <relativePath>../pom.xml</relativePath> 11 <relativePath>../pom.xml</relativePath>
12 </parent> 12 </parent>
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
11 <relativePath>../pom.xml</relativePath> 11 <relativePath>../pom.xml</relativePath>
12 </parent> 12 </parent>
13 13
14 - <artifactId>onos-net</artifactId> 14 + <artifactId>onos-core</artifactId>
15 <packaging>pom</packaging> 15 <packaging>pom</packaging>
16 16
17 <description>ONOS Core root project</description> 17 <description>ONOS Core root project</description>
18 18
19 <modules> 19 <modules>
20 <module>api</module> 20 <module>api</module>
21 - <module>core</module> 21 + <module>trivial</module>
22 </modules> 22 </modules>
23 23
24 <dependencies> 24 <dependencies>
......
...@@ -6,19 +6,15 @@ ...@@ -6,19 +6,15 @@
6 6
7 <parent> 7 <parent>
8 <groupId>org.onlab.onos</groupId> 8 <groupId>org.onlab.onos</groupId>
9 - <artifactId>onos-net</artifactId> 9 + <artifactId>onos-core</artifactId>
10 <version>1.0.0-SNAPSHOT</version> 10 <version>1.0.0-SNAPSHOT</version>
11 <relativePath>../pom.xml</relativePath> 11 <relativePath>../pom.xml</relativePath>
12 </parent> 12 </parent>
13 13
14 - <artifactId>onos-core</artifactId> 14 + <artifactId>onos-core-trivial</artifactId>
15 - <packaging>pom</packaging> 15 + <packaging>bundle</packaging>
16 16
17 - <description>ONOS network control core subsystems</description> 17 + <description>ONOS network control trivial implementations of core subsystems</description>
18 -
19 - <modules>
20 - <module>trivial</module>
21 - </modules>
22 18
23 <dependencies> 19 <dependencies>
24 <dependency> 20 <dependency>
...@@ -26,10 +22,6 @@ ...@@ -26,10 +22,6 @@
26 <artifactId>onos-api</artifactId> 22 <artifactId>onos-api</artifactId>
27 </dependency> 23 </dependency>
28 <dependency> 24 <dependency>
29 - <groupId>org.slf4j</groupId>
30 - <artifactId>slf4j-api</artifactId>
31 - </dependency>
32 - <dependency>
33 <groupId>org.apache.felix</groupId> 25 <groupId>org.apache.felix</groupId>
34 <artifactId>org.apache.felix.scr.annotations</artifactId> 26 <artifactId>org.apache.felix.scr.annotations</artifactId>
35 </dependency> 27 </dependency>
......
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 - <modelVersion>4.0.0</modelVersion>
6 -
7 - <parent>
8 - <groupId>org.onlab.onos</groupId>
9 - <artifactId>onos-core</artifactId>
10 - <version>1.0.0-SNAPSHOT</version>
11 - <relativePath>../pom.xml</relativePath>
12 - </parent>
13 -
14 - <artifactId>onos-core-trivial</artifactId>
15 - <packaging>bundle</packaging>
16 -
17 - <description>ONOS network control trivial implementations of core subsystems</description>
18 -
19 -</project>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <modules> 14 <modules>
15 <module>tools/build/conf</module> 15 <module>tools/build/conf</module>
16 <module>utils</module> 16 <module>utils</module>
17 - <module>net</module> 17 + <module>core</module>
18 <module>web</module> 18 <module>web</module>
19 <module>cli</module> 19 <module>cli</module>
20 <module>providers</module> 20 <module>providers</module>
......