Renaming 'exp' to 'incubator'.
Change-Id: I184f756b463dce31634410f4f3bf180cbe6c8adb
diff --git a/docs/external.xml b/docs/external.xml
index db56c76..e3618dd 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -68,7 +68,7 @@
<group>
<title>Incubator for Network Model & Services</title>
<packages>
- org.onosproject.exp:org.onosproject.exp.*
+ org.onosproject.exp:org.onosproject.incubator.*
</packages>
</group>
</groups>
diff --git a/docs/pom.xml b/docs/pom.xml
index 0ff71b9..68dacdf 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -61,7 +61,7 @@
<group>
<title>Incubator for Network Model & Services</title>
<packages>
- org.onosproject.exp:org.onosproject.exp.*
+ org.onosproject.exp:org.onosproject.incubator.*
</packages>
</group>
<group>
@@ -79,7 +79,7 @@
<group>
<title>Incubator for Core Subsystems & Distributed Stores</title>
<packages>
- org.onosproject.exp.net.impl:org.onosproject.exp.store.impl
+ org.onosproject.incubator.net.impl:org.onosproject.incubator.store.impl
</packages>
</group>
<group>
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
deleted file mode 100644
index b705cfb..0000000
--- a/exp/api/src/main/java/org/onosproject/exp/net/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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/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
deleted file mode 100644
index 822e4ad..0000000
--- a/exp/store/src/main/java/org/onosproject/exp/store/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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/exp/api/pom.xml b/incubator/api/pom.xml
similarity index 90%
rename from exp/api/pom.xml
rename to incubator/api/pom.xml
index 9279b3e..1a0e8ef 100644
--- a/exp/api/pom.xml
+++ b/incubator/api/pom.xml
@@ -21,15 +21,15 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-exp</artifactId>
+ <artifactId>onos-incubator</artifactId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-exp-api</artifactId>
+ <artifactId>onos-incubator-api</artifactId>
<packaging>bundle</packaging>
- <description>ONOS Incubator API</description>
+ <description>ONOS incubating core API</description>
<dependencies>
<dependency>
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/Config.java
similarity index 97%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/Config.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/Config.java
index e0896be..7018c65 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/Config.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/Config.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.exp.net.config;
+package org.onosproject.incubator.net.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/ConfigApplyDelegate.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigApplyDelegate.java
similarity index 94%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/ConfigApplyDelegate.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigApplyDelegate.java
index 6f3cb6d..3d3ac6c 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/ConfigApplyDelegate.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigApplyDelegate.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.exp.net.config;
+package org.onosproject.incubator.net.config;
/**
* Delegate for notification when configuration changes have been applied.
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/ConfigFactory.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigFactory.java
similarity index 97%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/ConfigFactory.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigFactory.java
index 94e599a..fbda722 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/ConfigFactory.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/ConfigFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.exp.net.config;
+package org.onosproject.incubator.net.config;
/**
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigRegistry.java
similarity index 97%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigRegistry.java
index b660a9b..76e9bab 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigRegistry.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.exp.net.config;
+package org.onosproject.incubator.net.config;
import java.util.Set;
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigService.java
similarity index 97%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigService.java
index 65731da..1524fd6 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/NetworkConfigService.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/NetworkConfigService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.exp.net.config;
+package org.onosproject.incubator.net.config;
import java.util.Set;
diff --git a/exp/api/src/main/java/org/onosproject/exp/net/config/package-info.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/package-info.java
similarity index 93%
rename from exp/api/src/main/java/org/onosproject/exp/net/config/package-info.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/config/package-info.java
index 836af2b..f40c586 100644
--- a/exp/api/src/main/java/org/onosproject/exp/net/config/package-info.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/package-info.java
@@ -17,4 +17,4 @@
/**
* Subsystem for tracking network environment configuration.
*/
-package org.onosproject.exp.net.config;
\ No newline at end of file
+package org.onosproject.incubator.net.config;
\ No newline at end of file
diff --git a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java b/incubator/api/src/main/java/org/onosproject/incubator/net/package-info.java
similarity index 87%
rename from exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
rename to incubator/api/src/main/java/org/onosproject/incubator/net/package-info.java
index 28d61c1..868eec7 100644
--- a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/package-info.java
@@ -15,6 +15,6 @@
*/
/**
- * Implementations of experimental core subsystems.
+ * Incubating network model abstractions and APIs.
*/
-package org.onosproject.exp.net.impl;
\ No newline at end of file
+package org.onosproject.incubator.net;
\ No newline at end of file
diff --git a/exp/api/src/main/java/org/onosproject/exp/package-info.java b/incubator/api/src/main/java/org/onosproject/incubator/package-info.java
similarity index 89%
rename from exp/api/src/main/java/org/onosproject/exp/package-info.java
rename to incubator/api/src/main/java/org/onosproject/incubator/package-info.java
index fc37829..8a12016 100644
--- a/exp/api/src/main/java/org/onosproject/exp/package-info.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/package-info.java
@@ -15,6 +15,6 @@
*/
/**
- * Experimental abstractions and APIs.
+ * Incubating abstractions and APIs.
*/
-package org.onosproject.exp;
\ No newline at end of file
+package org.onosproject.incubator;
\ No newline at end of file
diff --git a/exp/net/pom.xml b/incubator/net/pom.xml
similarity index 91%
rename from exp/net/pom.xml
rename to incubator/net/pom.xml
index 350a5e7..65bde31 100644
--- a/exp/net/pom.xml
+++ b/incubator/net/pom.xml
@@ -21,26 +21,26 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-exp</artifactId>
+ <artifactId>onos-incubator</artifactId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-exp-net</artifactId>
+ <artifactId>onos-incubator-net</artifactId>
<packaging>bundle</packaging>
- <description>ONOS network control core incubator subsystems</description>
+ <description>ONOS incubating network control core subsystems</description>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-exp-api</artifactId>
+ <artifactId>onos-incubator-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-exp-api</artifactId>
+ <artifactId>onos-incubator-api</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
diff --git a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java b/incubator/net/src/main/java/org/onosproject/incubator/net/impl/package-info.java
similarity index 86%
copy from exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
copy to incubator/net/src/main/java/org/onosproject/incubator/net/impl/package-info.java
index 28d61c1..842a58f 100644
--- a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/impl/package-info.java
@@ -15,6 +15,6 @@
*/
/**
- * Implementations of experimental core subsystems.
+ * Implementations of incubating core subsystems.
*/
-package org.onosproject.exp.net.impl;
\ No newline at end of file
+package org.onosproject.incubator.net.impl;
\ No newline at end of file
diff --git a/exp/pom.xml b/incubator/pom.xml
similarity index 97%
rename from exp/pom.xml
rename to incubator/pom.xml
index 5d3859f..235bff9 100644
--- a/exp/pom.xml
+++ b/incubator/pom.xml
@@ -26,7 +26,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-exp</artifactId>
+ <artifactId>onos-incubator</artifactId>
<packaging>pom</packaging>
<description>ONOS Incubator root project</description>
diff --git a/exp/store/pom.xml b/incubator/store/pom.xml
similarity index 76%
rename from exp/store/pom.xml
rename to incubator/store/pom.xml
index db02068..ff569f8 100644
--- a/exp/store/pom.xml
+++ b/incubator/store/pom.xml
@@ -21,19 +21,33 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-exp</artifactId>
+ <artifactId>onos-incubator</artifactId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-exp-store</artifactId>
+ <artifactId>onos-incubator-store</artifactId>
<packaging>bundle</packaging>
- <description>ONOS distributed store incubator subsystems</description>
+ <description>ONOS incubating distributed store subsystems</description>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-dist</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java b/incubator/store/src/main/java/org/onosproject/incubator/store/impl/package-info.java
similarity index 86%
copy from exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
copy to incubator/store/src/main/java/org/onosproject/incubator/store/impl/package-info.java
index 28d61c1..2755a98 100644
--- a/exp/net/src/main/java/org/onosproject/exp/net/impl/package-info.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/impl/package-info.java
@@ -15,6 +15,6 @@
*/
/**
- * Implementations of experimental core subsystems.
+ * Incubating distributed store implementations.
*/
-package org.onosproject.exp.net.impl;
\ No newline at end of file
+package org.onosproject.incubator.store.impl;
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a000472..b015bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<module>drivers</module>
<module>openflow</module>
<module>apps</module>
- <module>exp</module>
+ <module>incubator</module>
<module>features</module>
<module>tools/package/branding</module>
</modules>