Musings towards making dummyprovider accessible

Change-Id: I654e2b06c662e51eea0f89351099ccf4b289bbd2
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/pom.xml b/features/production/pom.xml
similarity index 100%
rename from features/pom.xml
rename to features/production/pom.xml

diff --git a/features/src/main/features/features.xml b/features/production/src/main/features/features.xml
similarity index 100%
rename from features/src/main/features/features.xml
rename to features/production/src/main/features/features.xml

diff --git a/features/test/pom.xml b/features/test/pom.xml
new file mode 100644 (file)
index 0000000..fe2b5e2
--- /dev/null
+++ b/features/test/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  <groupId>org.opendaylight.neutron</groupId>
+  <artifactId>features-neutron-test</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dummyprovider</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/NeutronNorthBound:Main</url>
+  </scm>
+</project>

diff --git a/features/test/src/main/features/features.xml b/features/test/src/main/features/features.xml
new file mode 100644 (file)
index 0000000..7cbee23
--- /dev/null
+++ b/features/test/src/main/features/features.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<features name="odl-neutron-test-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+   <repository>mvn:org.opendaylight.neutron/features-neutron/${project.version}/xml/features</repository>
+   <feature name='odl-neutron-dummyprovider-test' version='${project.version}' description="OpenDaylight :: Neutron :: Dummy Provider Test">
+    <feature version='${project.version}'>odl-neutron-service</feature>
+    <bundle>mvn:org.opendaylight.neutron/dummyprovider/${project.version}</bundle>
+  </feature>
+</features>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c49edc194f383beaae9212896a74caf7b8413b56..e48acf4d89824299d98b79cf75f4e2c39a59c1ba 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -21,7 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <karaf.localFeature>odl-neutron-service</karaf.localFeature>
+    <karaf.localFeature>odl-neutron-dummyprovider-test</karaf.localFeature>
   </properties>
   <dependencies>
     <dependency>
@@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>features-neutron</artifactId>
+      <artifactId>features-neutron-test</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

diff --git a/pom.xml b/pom.xml
index 7593e2fb497d966ade5dd1482e2bc7c74ae8bba1..119d94fddfa0b7a3ff6072bd58f4ecfc26c5de5d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,8 @@
     <module>northbound-api</module>
     <module>transcriber</module>
     <module>dummyprovider</module>
-    <module>features</module>
+    <module>features/production</module>
+    <module>features/test</module>
     <module>karaf</module>
     <module>model</module>
   </modules>