홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
d3858e48 1 parent 62f04a47

Adding a separate set of modules to serve as an incubator for new core API & implementations. 

Change-Id: Ic7df5243ea18dec4f96f47dd2cf922e33827f4de
Inline Side-by-side
Showing 11 changed files with 392 additions and 0 deletions
...@@ -65,6 +65,12 @@ ...@@ -65,6 +65,12 @@
65 org.onlab.* 65 org.onlab.*
66 </packages> 66 </packages>
67 </group> 67 </group>
68 + <group>
69 + <title>Incubator for Network Model &amp; Services</title>
70 + <packages>
71 + org.onosproject.incubator:org.onosproject.exp.*
72 + </packages>
73 + </group>
68 </groups> 74 </groups>
69 </configuration> 75 </configuration>
70 </plugin> 76 </plugin>
......
...@@ -59,6 +59,12 @@ ...@@ -59,6 +59,12 @@
59 </packages> 59 </packages>
60 </group> 60 </group>
61 <group> 61 <group>
62 + <title>Incubator for Network Model &amp; Services</title>
63 + <packages>
64 + org.onosproject.incubator:org.onosproject.exp.*
65 + </packages>
66 + </group>
67 + <group>
62 <title>Core Subsystems</title> 68 <title>Core Subsystems</title>
63 <packages> 69 <packages>
64 org.onosproject.impl:org.onosproject.core.impl:org.onosproject.cluster.impl:org.onosproject.net.device.impl:org.onosproject.net.link.impl:org.onosproject.net.host.impl:org.onosproject.net.topology.impl:org.onosproject.net.packet.impl:org.onosproject.net.flow.impl:org.onosproject.net.*.impl:org.onosproject.event.impl:org.onosproject.net.intent.impl*:org.onosproject.net.proxyarp.impl:org.onosproject.mastership.impl:org.onosproject.net.resource.impl:org.onosproject.json:org.onosproject.json.*:org.onosproject.provider.host.impl:org.onosproject.provider.lldp.impl:org.onosproject.net.statistic.impl:org.onosproject.app.impl:org.onosproject.common.*:org.onosproject.net.group.impl:org.onosproject.cfg.impl:org.onosproject.net.driver.impl:org.onosproject.net.flowobjective.impl:org.onosproject.net.flowext.impl:org.onosproject.net.tunnel.impl 70 org.onosproject.impl:org.onosproject.core.impl:org.onosproject.cluster.impl:org.onosproject.net.device.impl:org.onosproject.net.link.impl:org.onosproject.net.host.impl:org.onosproject.net.topology.impl:org.onosproject.net.packet.impl:org.onosproject.net.flow.impl:org.onosproject.net.*.impl:org.onosproject.event.impl:org.onosproject.net.intent.impl*:org.onosproject.net.proxyarp.impl:org.onosproject.mastership.impl:org.onosproject.net.resource.impl:org.onosproject.json:org.onosproject.json.*:org.onosproject.provider.host.impl:org.onosproject.provider.lldp.impl:org.onosproject.net.statistic.impl:org.onosproject.app.impl:org.onosproject.common.*:org.onosproject.net.group.impl:org.onosproject.cfg.impl:org.onosproject.net.driver.impl:org.onosproject.net.flowobjective.impl:org.onosproject.net.flowext.impl:org.onosproject.net.tunnel.impl
...@@ -71,6 +77,12 @@ ...@@ -71,6 +77,12 @@
71 </packages> 77 </packages>
72 </group> 78 </group>
73 <group> 79 <group>
80 + <title>Incubator for Core Subsystems &amp; Distributed Stores</title>
81 + <packages>
82 + org.onosproject.exp.net.impl:org.onosproject.exp.store.impl
83 + </packages>
84 + </group>
85 + <group>
74 <title>OpenFlow Providers &amp; Controller</title> 86 <title>OpenFlow Providers &amp; Controller</title>
75 <packages> 87 <packages>
76 org.onosproject.provider.of.*:org.onosproject.openflow.* 88 org.onosproject.provider.of.*:org.onosproject.openflow.*
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos-exp</artifactId>
25 + <version>1.2.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 + <artifactId>onos-exp-api</artifactId>
30 + <packaging>bundle</packaging>
31 +
32 + <description>ONOS Incubator API</description>
33 +
34 + <dependencies>
35 + <dependency>
36 + <groupId>com.google.guava</groupId>
37 + <artifactId>guava-testlib</artifactId>
38 + <scope>test</scope>
39 + </dependency>
40 + <dependency>
41 + <groupId>org.easymock</groupId>
42 + <artifactId>easymock</artifactId>
43 + <scope>test</scope>
44 + </dependency>
45 + </dependencies>
46 +
47 +</project>
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Experimental network model abstractions and APIs.
19 + */
20 +package org.onosproject.exp.net;
...\ No newline at end of file ...\ No newline at end of file
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Experimental abstractions and APIs.
19 + */
20 +package org.onosproject.exp;
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos-exp</artifactId>
25 + <version>1.2.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 + <artifactId>onos-exp-net</artifactId>
30 + <packaging>bundle</packaging>
31 +
32 + <description>ONOS network control core incubator subsystems</description>
33 +
34 + <dependencies>
35 + <dependency>
36 + <groupId>org.onosproject</groupId>
37 + <artifactId>onos-exp-api</artifactId>
38 + <version>${project.version}</version>
39 + </dependency>
40 +
41 + <dependency>
42 + <groupId>org.onosproject</groupId>
43 + <artifactId>onos-exp-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>
51 + <artifactId>onos-core-trivial</artifactId>
52 + <version>${project.version}</version>
53 + <scope>test</scope>
54 + </dependency>
55 +
56 + <!-- FIXME remove when we figure out the trivial store -->
57 + <dependency>
58 + <groupId>org.onosproject</groupId>
59 + <artifactId>onos-core-dist</artifactId>
60 + <version>${project.version}</version>
61 + <scope>test</scope>
62 + </dependency>
63 +
64 + <dependency>
65 + <groupId>org.onosproject</groupId>
66 + <artifactId>onos-core-common</artifactId>
67 + <version>${project.version}</version>
68 + <classifier>tests</classifier>
69 + <scope>test</scope>
70 + </dependency>
71 +
72 + <dependency>
73 + <groupId>org.easymock</groupId>
74 + <artifactId>easymock</artifactId>
75 + <scope>test</scope>
76 + </dependency>
77 +
78 + <dependency>
79 + <groupId>org.apache.felix</groupId>
80 + <artifactId>org.apache.felix.scr.annotations</artifactId>
81 + </dependency>
82 +
83 + <dependency>
84 + <groupId>org.apache.karaf.features</groupId>
85 + <artifactId>org.apache.karaf.features.core</artifactId>
86 + </dependency>
87 +
88 + <dependency>
89 + <groupId>org.apache.karaf.system</groupId>
90 + <artifactId>org.apache.karaf.system.core</artifactId>
91 + </dependency>
92 + </dependencies>
93 +
94 + <build>
95 + <plugins>
96 + <plugin>
97 + <groupId>org.apache.felix</groupId>
98 + <artifactId>maven-scr-plugin</artifactId>
99 + </plugin>
100 + </plugins>
101 + </build>
102 +
103 +</project>
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Implementations of experimental core subsystems.
19 + */
20 +package org.onosproject.exp.net.impl;
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2014 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos</artifactId>
25 + <version>1.2.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 + <artifactId>onos-exp</artifactId>
30 + <packaging>pom</packaging>
31 +
32 + <description>ONOS Incubator root project</description>
33 +
34 + <modules>
35 + <module>api</module>
36 + <module>net</module>
37 + <module>store</module>
38 + </modules>
39 +
40 + <dependencies>
41 + <dependency>
42 + <groupId>org.onosproject</groupId>
43 + <artifactId>onos-api</artifactId>
44 + </dependency>
45 + <dependency>
46 + <groupId>com.google.guava</groupId>
47 + <artifactId>guava</artifactId>
48 + </dependency>
49 + <dependency>
50 + <groupId>org.onosproject</groupId>
51 + <artifactId>onlab-misc</artifactId>
52 + </dependency>
53 + <dependency>
54 + <groupId>org.onosproject</groupId>
55 + <artifactId>onlab-junit</artifactId>
56 + <scope>test</scope>
57 + </dependency>
58 + <dependency>
59 + <groupId>org.osgi</groupId>
60 + <artifactId>org.osgi.compendium</artifactId>
61 + </dependency>
62 + </dependencies>
63 +
64 + <build>
65 + <plugins>
66 + <plugin>
67 + <groupId>org.apache.felix</groupId>
68 + <artifactId>maven-bundle-plugin</artifactId>
69 + </plugin>
70 +
71 + <plugin>
72 + <groupId>org.onosproject</groupId>
73 + <artifactId>onos-maven-plugin</artifactId>
74 + </plugin>
75 + </plugins>
76 + </build>
77 +
78 +</project>
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos-exp</artifactId>
25 + <version>1.2.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 + <artifactId>onos-exp-store</artifactId>
30 + <packaging>bundle</packaging>
31 +
32 + <description>ONOS distributed store incubator subsystems</description>
33 +
34 + <dependencies>
35 + <dependency>
36 + <groupId>org.onosproject</groupId>
37 + <artifactId>onos-core-dist</artifactId>
38 + <version>${project.version}</version>
39 + </dependency>
40 +
41 + <dependency>
42 + <groupId>com.google.guava</groupId>
43 + <artifactId>guava-testlib</artifactId>
44 + <scope>test</scope>
45 + </dependency>
46 + <dependency>
47 + <groupId>org.easymock</groupId>
48 + <artifactId>easymock</artifactId>
49 + <scope>test</scope>
50 + </dependency>
51 + <dependency>
52 + <groupId>org.onosproject</groupId>
53 + <artifactId>onos-api</artifactId>
54 + <classifier>tests</classifier>
55 + <scope>test</scope>
56 + </dependency>
57 + <dependency>
58 + <groupId>com.hazelcast</groupId>
59 + <artifactId>hazelcast</artifactId>
60 + <classifier>tests</classifier>
61 + <scope>test</scope>
62 + </dependency>
63 + </dependencies>
64 +
65 +</project>
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/**
18 + * Experimental distributed store implementations.
19 + */
20 +package org.onosproject.exp.store.impl;
...\ No newline at end of file ...\ No newline at end of file
...@@ -48,6 +48,7 @@ ...@@ -48,6 +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>features</module> 52 <module>features</module>
52 <module>tools/package/branding</module> 53 <module>tools/package/branding</module>
53 </modules> 54 </modules>
......