diff --git a/docs/external.xml b/docs/external.xml index 15b0897474..60d72b7560 100644 --- a/docs/external.xml +++ b/docs/external.xml @@ -65,6 +65,12 @@ org.onlab.* + + Incubator for Network Model & Services + + org.onosproject.incubator:org.onosproject.exp.* + + diff --git a/docs/pom.xml b/docs/pom.xml index 771e189a17..b8b1bd2699 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -58,6 +58,12 @@ org.onosproject:org.onosproject.* + + Incubator for Network Model & Services + + org.onosproject.incubator:org.onosproject.exp.* + + Core Subsystems @@ -70,6 +76,12 @@ org.onosproject.store.* + + Incubator for Core Subsystems & Distributed Stores + + org.onosproject.exp.net.impl:org.onosproject.exp.store.impl + + OpenFlow Providers & Controller diff --git a/exp/api/pom.xml b/exp/api/pom.xml new file mode 100644 index 0000000000..9279b3e14b --- /dev/null +++ b/exp/api/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + + org.onosproject + onos-exp + 1.2.0-SNAPSHOT + ../pom.xml + + + onos-exp-api + bundle + + ONOS Incubator API + + + + com.google.guava + guava-testlib + test + + + org.easymock + easymock + test + + + + diff --git a/exp/api/src/main/java/org/onosproject/exp/net/package-info.java b/exp/api/src/main/java/org/onosproject/exp/net/package-info.java new file mode 100644 index 0000000000..b705cfb0a6 --- /dev/null +++ b/exp/api/src/main/java/org/onosproject/exp/net/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Experimental network model abstractions and APIs. + */ +package org.onosproject.exp.net; \ No newline at end of file diff --git a/exp/api/src/main/java/org/onosproject/exp/package-info.java b/exp/api/src/main/java/org/onosproject/exp/package-info.java new file mode 100644 index 0000000000..fc378290e2 --- /dev/null +++ b/exp/api/src/main/java/org/onosproject/exp/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Experimental abstractions and APIs. + */ +package org.onosproject.exp; \ No newline at end of file diff --git a/exp/net/pom.xml b/exp/net/pom.xml new file mode 100644 index 0000000000..350a5e77d8 --- /dev/null +++ b/exp/net/pom.xml @@ -0,0 +1,103 @@ + + + + 4.0.0 + + + org.onosproject + onos-exp + 1.2.0-SNAPSHOT + ../pom.xml + + + onos-exp-net + bundle + + ONOS network control core incubator subsystems + + + + org.onosproject + onos-exp-api + ${project.version} + + + + org.onosproject + onos-exp-api + ${project.version} + tests + test + + + + org.onosproject + onos-core-trivial + ${project.version} + test + + + + + org.onosproject + onos-core-dist + ${project.version} + test + + + + org.onosproject + onos-core-common + ${project.version} + tests + test + + + + org.easymock + easymock + test + + + + org.apache.felix + org.apache.felix.scr.annotations + + + + org.apache.karaf.features + org.apache.karaf.features.core + + + + org.apache.karaf.system + org.apache.karaf.system.core + + + + + + + org.apache.felix + maven-scr-plugin + + + + + diff --git a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java b/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java new file mode 100644 index 0000000000..28d61c173f --- /dev/null +++ b/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Implementations of experimental core subsystems. + */ +package org.onosproject.exp.net.impl; \ No newline at end of file diff --git a/exp/pom.xml b/exp/pom.xml new file mode 100644 index 0000000000..5d3859fb93 --- /dev/null +++ b/exp/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + + org.onosproject + onos + 1.2.0-SNAPSHOT + ../pom.xml + + + onos-exp + pom + + ONOS Incubator root project + + + api + net + store + + + + + org.onosproject + onos-api + + + com.google.guava + guava + + + org.onosproject + onlab-misc + + + org.onosproject + onlab-junit + test + + + org.osgi + org.osgi.compendium + + + + + + + org.apache.felix + maven-bundle-plugin + + + + org.onosproject + onos-maven-plugin + + + + + diff --git a/exp/store/pom.xml b/exp/store/pom.xml new file mode 100644 index 0000000000..db020688ba --- /dev/null +++ b/exp/store/pom.xml @@ -0,0 +1,65 @@ + + + + 4.0.0 + + + org.onosproject + onos-exp + 1.2.0-SNAPSHOT + ../pom.xml + + + onos-exp-store + bundle + + ONOS distributed store incubator subsystems + + + + org.onosproject + onos-core-dist + ${project.version} + + + + com.google.guava + guava-testlib + test + + + org.easymock + easymock + test + + + org.onosproject + onos-api + tests + test + + + com.hazelcast + hazelcast + tests + test + + + + diff --git a/exp/store/src/main/java/org/onosproject/exp/store/impl/package-info.java b/exp/store/src/main/java/org/onosproject/exp/store/impl/package-info.java new file mode 100644 index 0000000000..822e4adc55 --- /dev/null +++ b/exp/store/src/main/java/org/onosproject/exp/store/impl/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Experimental distributed store implementations. + */ +package org.onosproject.exp.store.impl; \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0349386d30..7645fa6488 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ drivers openflow apps + exp features tools/package/branding