Modify AbstractConfigTestBase to use opendaylight-karaf-empty 76/36776/9
authorTom Pantelis <tpanteli@brocade.com>
Tue, 29 Mar 2016 13:34:52 +0000 (09:34 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Thu, 31 Mar 2016 19:13:01 +0000 (19:13 +0000)
The vanilla karaf distro that AbstractConfigTestBase installs only has the
base features. We need the standard features which includes eventadmin
which is needed for the upcomng blueprint work. So I changed
AbstractConfigTestBase to install opendaylight-karaf-empty which now
includes the standard features as well as the updated Aries proxy-impl
1.0.5 artifact.

Change-Id: I46100cc8edb9743e0885b156a1adc37e3a18ca9e
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
opendaylight/config/config-it-base/pom.xml
opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java
opendaylight/config/config-it-base/src/main/resources/abstractconfigtestbase.properties

index 6c34e91..3848188 100644 (file)
@@ -17,6 +17,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
   <artifactId>config-it-base</artifactId>
   <packaging>bundle</packaging>
+
+  <properties>
+    <opendaylight.karaf.version>1.7.0-SNAPSHOT</opendaylight.karaf.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -33,6 +38,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <version>${opendaylight.karaf.version}</version>
+      <type>zip</type>
+    </dependency>
+
     <!-- Dependencies for pax exam karaf container -->
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
index ce38de2..05bcfbc 100644 (file)
@@ -56,8 +56,8 @@ public abstract class AbstractConfigTestBase {
      * Default values for karaf distro type, groupId, and artifactId
      */
     private static final String KARAF_DISTRO_TYPE = "zip";
-    private static final String KARAF_DISTRO_ARTIFACTID = "apache-karaf";
-    private static final String KARAF_DISTRO_GROUPID = "org.apache.karaf";
+    private static final String KARAF_DISTRO_ARTIFACTID = "opendaylight-karaf-empty";
+    private static final String KARAF_DISTRO_GROUPID = "org.opendaylight.controller";
 
     /*
      * Property names to override defaults for karaf distro artifactId, groupId, version, and type

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.