홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
d24aa7f6 1 parent 8dd716ab

Renaming 'exp' to 'incubator'. 

Change-Id: I184f756b463dce31634410f4f3bf180cbe6c8adb
Inline Side-by-side
Showing 17 changed files with 44 additions and 30 deletions
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 <group> 68 <group>
69 <title>Incubator for Network Model &amp; Services</title> 69 <title>Incubator for Network Model &amp; Services</title>
70 <packages> 70 <packages>
71 - org.onosproject.exp:org.onosproject.exp.* 71 + org.onosproject.exp:org.onosproject.incubator.*
72 </packages> 72 </packages>
73 </group> 73 </group>
74 </groups> 74 </groups>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <group> 61 <group>
62 <title>Incubator for Network Model &amp; Services</title> 62 <title>Incubator for Network Model &amp; Services</title>
63 <packages> 63 <packages>
64 - org.onosproject.exp:org.onosproject.exp.* 64 + org.onosproject.exp:org.onosproject.incubator.*
65 </packages> 65 </packages>
66 </group> 66 </group>
67 <group> 67 <group>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 <group> 79 <group>
80 <title>Incubator for Core Subsystems &amp; Distributed Stores</title> 80 <title>Incubator for Core Subsystems &amp; Distributed Stores</title>
81 <packages> 81 <packages>
82 - org.onosproject.exp.net.impl:org.onosproject.exp.store.impl 82 + org.onosproject.incubator.net.impl:org.onosproject.incubator.store.impl
83 </packages> 83 </packages>
84 </group> 84 </group>
85 <group> 85 <group>
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
21 21
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 - <artifactId>onos-exp</artifactId> 24 + <artifactId>onos-incubator</artifactId>
25 <version>1.2.0-SNAPSHOT</version> 25 <version>1.2.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onos-exp-api</artifactId> 29 + <artifactId>onos-incubator-api</artifactId>
30 <packaging>bundle</packaging> 30 <packaging>bundle</packaging>
31 31
32 - <description>ONOS Incubator API</description> 32 + <description>ONOS incubating core API</description>
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <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.onosproject.exp.net.config; 16 +package org.onosproject.incubator.net.config;
17 17
18 import com.fasterxml.jackson.databind.ObjectMapper; 18 import com.fasterxml.jackson.databind.ObjectMapper;
19 import com.fasterxml.jackson.databind.node.ObjectNode; 19 import com.fasterxml.jackson.databind.node.ObjectNode;
......
...@@ -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.onosproject.exp.net.config; 16 +package org.onosproject.incubator.net.config;
17 17
18 /** 18 /**
19 * Delegate for notification when configuration changes have been applied. 19 * Delegate for notification when configuration changes have been applied.
......
...@@ -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.onosproject.exp.net.config; 16 +package org.onosproject.incubator.net.config;
17 17
18 18
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.onosproject.exp.net.config; 16 +package org.onosproject.incubator.net.config;
17 17
18 import java.util.Set; 18 import java.util.Set;
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.onosproject.exp.net.config; 16 +package org.onosproject.incubator.net.config;
17 17
18 import java.util.Set; 18 import java.util.Set;
19 19
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Subsystem for tracking network environment configuration. 18 * Subsystem for tracking network environment configuration.
19 */ 19 */
20 -package org.onosproject.exp.net.config;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.incubator.net.config;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Experimental network model abstractions and APIs. 18 + * Incubating network model abstractions and APIs.
19 */ 19 */
20 -package org.onosproject.exp.net;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.incubator.net;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Experimental abstractions and APIs. 18 + * Incubating abstractions and APIs.
19 */ 19 */
20 -package org.onosproject.exp;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.incubator;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,26 +21,26 @@ ...@@ -21,26 +21,26 @@
21 21
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 - <artifactId>onos-exp</artifactId> 24 + <artifactId>onos-incubator</artifactId>
25 <version>1.2.0-SNAPSHOT</version> 25 <version>1.2.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onos-exp-net</artifactId> 29 + <artifactId>onos-incubator-net</artifactId>
30 <packaging>bundle</packaging> 30 <packaging>bundle</packaging>
31 31
32 - <description>ONOS network control core incubator subsystems</description> 32 + <description>ONOS incubating network control core subsystems</description>
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 <groupId>org.onosproject</groupId> 36 <groupId>org.onosproject</groupId>
37 - <artifactId>onos-exp-api</artifactId> 37 + <artifactId>onos-incubator-api</artifactId>
38 <version>${project.version}</version> 38 <version>${project.version}</version>
39 </dependency> 39 </dependency>
40 40
41 <dependency> 41 <dependency>
42 <groupId>org.onosproject</groupId> 42 <groupId>org.onosproject</groupId>
43 - <artifactId>onos-exp-api</artifactId> 43 + <artifactId>onos-incubator-api</artifactId>
44 <version>${project.version}</version> 44 <version>${project.version}</version>
45 <classifier>tests</classifier> 45 <classifier>tests</classifier>
46 <scope>test</scope> 46 <scope>test</scope>
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Implementations of experimental core subsystems. 18 + * Implementations of incubating core subsystems.
19 */ 19 */
20 -package org.onosproject.exp.net.impl;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.incubator.net.impl;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onos-exp</artifactId> 29 + <artifactId>onos-incubator</artifactId>
30 <packaging>pom</packaging> 30 <packaging>pom</packaging>
31 31
32 <description>ONOS Incubator root project</description> 32 <description>ONOS Incubator root project</description>
......
...@@ -21,19 +21,33 @@ ...@@ -21,19 +21,33 @@
21 21
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 - <artifactId>onos-exp</artifactId> 24 + <artifactId>onos-incubator</artifactId>
25 <version>1.2.0-SNAPSHOT</version> 25 <version>1.2.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
29 - <artifactId>onos-exp-store</artifactId> 29 + <artifactId>onos-incubator-store</artifactId>
30 <packaging>bundle</packaging> 30 <packaging>bundle</packaging>
31 31
32 - <description>ONOS distributed store incubator subsystems</description> 32 + <description>ONOS incubating distributed store subsystems</description>
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 <groupId>org.onosproject</groupId> 36 <groupId>org.onosproject</groupId>
37 + <artifactId>onos-incubator-api</artifactId>
38 + <version>${project.version}</version>
39 + </dependency>
40 +
41 + <dependency>
42 + <groupId>org.onosproject</groupId>
43 + <artifactId>onos-incubator-api</artifactId>
44 + <version>${project.version}</version>
45 + <classifier>tests</classifier>
46 + <scope>test</scope>
47 + </dependency>
48 +
49 + <dependency>
50 + <groupId>org.onosproject</groupId>
37 <artifactId>onos-core-dist</artifactId> 51 <artifactId>onos-core-dist</artifactId>
38 <version>${project.version}</version> 52 <version>${project.version}</version>
39 </dependency> 53 </dependency>
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Experimental distributed store implementations. 18 + * Incubating distributed store implementations.
19 */ 19 */
20 -package org.onosproject.exp.store.impl;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.incubator.store.impl;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <module>drivers</module> 48 <module>drivers</module>
49 <module>openflow</module> 49 <module>openflow</module>
50 <module>apps</module> 50 <module>apps</module>
51 - <module>exp</module> 51 + <module>incubator</module>
52 <module>features</module> 52 <module>features</module>
53 <module>tools/package/branding</module> 53 <module>tools/package/branding</module>
54 </modules> 54 </modules>
......