Bug 7636: Karaf4 migration

Change-Id: I4face8a6c4aea0328927fb42dae1485ec52bf4aa
Signed-off-by: Mufaddal Makati <m.makati@cablelabs.com>

diff --git a/features-packetcable-policy/features-packetcable-policy/pom.xml b/features-packetcable-policy/features-packetcable-policy/pom.xml
new file mode 100644 (file)
index 0000000..8ddedd0
--- /dev/null
+++ b/features-packetcable-policy/features-packetcable-policy/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2015 CableLabs, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.8.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <artifactId>features-packetcable-policy</artifactId>
+    <groupId>org.opendaylight.packetcable</groupId>
+    <name>${project.artifactId}</name>
+    <version>1.5.0-SNAPSHOT</version>
+    <properties>
+        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+        <feature.test.version>1.8.0-SNAPSHOT</feature.test.version>
+        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>features-yangtools</artifactId>
+            <version>${yangtools.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-mdsal</artifactId>
+            <version>${mdsal.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>features-mdsal-model</artifactId>
+          <version>${mdsal.model.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+          <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features-restconf</artifactId>
+            <classifier>features</classifier>
+            <version>${restconf.version}</version>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.packetcable</groupId>
+          <artifactId>packetcable-policy-server</artifactId>
+          <version>${project.version}</version>
+          <classifier>config</classifier>
+          <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>packetcable-policy-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>packetcable-policy-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>packetcable-driver</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-test</artifactId>
+            <version>${feature.test.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

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

diff --git a/features-packetcable-policy/features4-packetcable-policy/pom.xml b/features-packetcable-policy/features4-packetcable-policy/pom.xml
new file mode 100644 (file)
index 0000000..fd1a39c
--- /dev/null
+++ b/features-packetcable-policy/features4-packetcable-policy/pom.xml
@@ -0,0 +1,42 @@
+<?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>feature-repo-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>features4-packetcable-policy</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-packetcable-policy-server-all</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-packetcable-policy-model</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-packetcable-policy-server</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

diff --git a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
new file mode 100644 (file)
index 0000000..02166f1
--- /dev/null
+++ b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
@@ -0,0 +1,47 @@
+<?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>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>odl-packetcable-policy-model</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: packetcable :: policy :: Model</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.10.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-models</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>packetcable-policy-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

diff --git a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
new file mode 100644 (file)
index 0000000..940d410
--- /dev/null
+++ b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
@@ -0,0 +1,31 @@
+<?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>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>odl-packetcable-policy-server-all</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: packetcable :: policy :: All</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>odl-packetcable-policy-server</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

diff --git a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
new file mode 100644 (file)
index 0000000..de522c3
--- /dev/null
+++ b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
@@ -0,0 +1,56 @@
+<?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>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>odl-packetcable-policy-server</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: packetcable :: policy :: Provider</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-mdsal-apidocs</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.packetcable</groupId>
+            <artifactId>odl-packetcable-policy-model</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>packetcable-policy-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>packetcable-driver</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

diff --git a/features-packetcable-policy/pom.xml b/features-packetcable-policy/pom.xml
index 8ddedd03d449166c43ee4c6da463d23e4f16c530..b84caeec27edc4f4fb219ab81dc81d1739b73e0c 100644 (file)
--- a/features-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/pom.xml
@@ -11,81 +11,21 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
+        <artifactId>odlparent-lite</artifactId>
         <version>1.8.0-SNAPSHOT</version>
         <relativePath />
     </parent>
-    <artifactId>features-packetcable-policy</artifactId>
+    <artifactId>features-packetcable-policy-aggregator</artifactId>
     <groupId>org.opendaylight.packetcable</groupId>
-    <name>${project.artifactId}</name>
     <version>1.5.0-SNAPSHOT</version>
-    <properties>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
-        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
-        <feature.test.version>1.8.0-SNAPSHOT</feature.test.version>
-        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <version>${yangtools.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>${mdsal.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal.model</groupId>
-          <artifactId>features-mdsal-model</artifactId>
-          <version>${mdsal.model.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <classifier>features</classifier>
-            <version>${restconf.version}</version>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.packetcable</groupId>
-          <artifactId>packetcable-policy-server</artifactId>
-          <version>${project.version}</version>
-          <classifier>config</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-policy-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-policy-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-driver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${feature.test.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>features-packetcable-policy</module>
+        <module>features4-packetcable-policy</module>
+        <module>odl-packetcable-policy-model</module>
+        <module>odl-packetcable-policy-server</module>
+        <module>odl-packetcable-policy-server-all</module>
+    </modules>
+
 </project>

diff --git a/packetcable-driver/pom.xml b/packetcable-driver/pom.xml
index 64915912edd71257698c6d0cbbcc845ffa23638a..768613e17aff46991f9418f115c4526a262201f0 100644 (file)
--- a/packetcable-driver/pom.xml
+++ b/packetcable-driver/pom.xml
@@ -64,14 +64,7 @@
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-               </dependency>
+
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>

diff --git a/packetcable-emulator/pom.xml b/packetcable-emulator/pom.xml
index b00455a85d0838e7da4931f440906c77a4d7fae6..55d476270ac3dbe8ec4907029c17ee9ea00d6c4f 100644 (file)
--- a/packetcable-emulator/pom.xml
+++ b/packetcable-emulator/pom.xml
@@ -43,6 +43,14 @@
             <version>2.5.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
     </dependencies>
 
 </project>