From 9656ff8d3703e3dfef0486d8af69f39428be228c Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 29 Jul 2016 15:04:39 +0200
Subject: HONEYCOMB-130: Create vpp-integration distribution

And remove v3po-karaf. No need for plugins to create karaf distro,
instead plugins are required to add their features into vpp-integration

Change-Id: I74c29843ee7927bcc4456fbe2bfb52506225078f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 pom.xml                                            |  1 +
 v3po/Readme.adoc                                   |  7 ++
 v3po/karaf/pom.xml                                 | 74 -----------------
 v3po/pom.xml                                       |  1 -
 vpp-integration/Readme.adoc                        |  3 +
 vpp-integration/features/pom.xml                   | 59 ++++++++++++++
 .../features/src/main/features/features.xml        | 52 ++++++++++++
 vpp-integration/karaf/pom.xml                      | 92 ++++++++++++++++++++++
 vpp-integration/pom.xml                            | 56 +++++++++++++
 9 files changed, 270 insertions(+), 75 deletions(-)
 create mode 100644 v3po/Readme.adoc
 delete mode 100644 v3po/karaf/pom.xml
 create mode 100644 vpp-integration/Readme.adoc
 create mode 100644 vpp-integration/features/pom.xml
 create mode 100644 vpp-integration/features/src/main/features/features.xml
 create mode 100644 vpp-integration/karaf/pom.xml
 create mode 100644 vpp-integration/pom.xml

diff --git a/pom.xml b/pom.xml
index 40ee2c4dd..f0f23a846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
     <module>infra</module>
     <module>vpp-common</module>
     <module>v3po</module>
+    <module>vpp-integration</module>
   </modules>
 
   <distributionManagement>
diff --git a/v3po/Readme.adoc b/v3po/Readme.adoc
new file mode 100644
index 000000000..96d1d5a9b
--- /dev/null
+++ b/v3po/Readme.adoc
@@ -0,0 +1,7 @@
+= V3po
+
+This is a Honeycomb plugin providing mapping code between HC and VPP core APIs.
+
+== Usage
+
+Refer to postman_rest_collection.json for sample requests. All capabilities of V3po are demo-ed there
\ No newline at end of file
diff --git a/v3po/karaf/pom.xml b/v3po/karaf/pom.xml
deleted file mode 100644
index 1325a988d..000000000
--- a/v3po/karaf/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- 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.
--->
-<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">
-  <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/karaf-parent</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.v3po</groupId>
-  <artifactId>v3po-karaf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-honeycomb-v3po-rest</karaf.localFeature>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>v3po-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/v3po/pom.xml b/v3po/pom.xml
index 0d356d47f..f7cb1c2ba 100644
--- a/v3po/pom.xml
+++ b/v3po/pom.xml
@@ -35,7 +35,6 @@
     <module>api</module>
     <module>v3po2vpp</module>
     <module>features</module>
-    <module>karaf</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
diff --git a/vpp-integration/Readme.adoc b/vpp-integration/Readme.adoc
new file mode 100644
index 000000000..cba82974b
--- /dev/null
+++ b/vpp-integration/Readme.adoc
@@ -0,0 +1,3 @@
+= VPP-integration
+
+This is an integration project building HC distribution for VPP, including all available HC plugins for VPP
diff --git a/vpp-integration/features/pom.xml b/vpp-integration/features/pom.xml
new file mode 100644
index 000000000..9e8930dec
--- /dev/null
+++ b/vpp-integration/features/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2015 Cisco and/or its affiliates.
+ 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.
+-->
+<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">
+  <parent>
+    <groupId>io.fd.honeycomb.common</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../common/features-parent</relativePath>
+  </parent>
+  <groupId>io.fd.honeycomb.vpp.integration</groupId>
+  <artifactId>vpp-integration-features</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <dependencies>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>honeycomb-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb.vpp</groupId>
+      <artifactId>vpp-common-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb.v3po</groupId>
+      <artifactId>v3po-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/vpp-integration/features/src/main/features/features.xml b/vpp-integration/features/src/main/features/features.xml
new file mode 100644
index 000000000..f25e32d05
--- /dev/null
+++ b/vpp-integration/features/src/main/features/features.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2015 Cisco and/or its affiliates.
+ 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.
+-->
+<features name="odl-honeycomb-integration-${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">
+
+  <!-- infra -->
+  <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
+  <!-- VPP HC plugin common code -->
+  <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository>
+  <!-- V3PO plugin -->
+  <repository>mvn:io.fd.honeycomb.v3po/v3po-features/${project.version}/xml/features</repository>
+
+  <feature name='honeycomb-vpp-integration-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
+    <feature version='${project.version}'>odl-honeycomb-api</feature>
+    <feature version='${project.version}'>odl-honeycomb-v3po-api</feature>
+  </feature>
+
+  <feature name='honeycomb-vpp-integration' version='${project.version}' description='OpenDaylight :: v3po'>
+    <feature version='${project.version}'>honeycomb-vpp-integration-api</feature>
+    <feature version='${project.version}'>odl-honeycomb</feature>
+    <feature version='${project.version}'>odl-honeycomb-vpp-common</feature>
+    <feature version='${project.version}'>odl-honeycomb-v3po</feature>
+  </feature>
+
+  <feature name='honeycomb-vpp-integration-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
+    <feature version='${project.version}'>honeycomb-vpp-integration</feature>
+    <feature version='${project.version}'>odl-honeycomb-rest</feature>
+    <feature version='${project.version}'>odl-honeycomb-v3po</feature>
+  </feature>
+
+  <feature name='honeycomb-vpp-integration-ui' version='${project.version}' description='OpenDaylight :: v3po :: ui'>
+    <feature version='${project.version}'>honeycomb-vpp-integration-rest</feature>
+    <feature version='${project.version}'>odl-honeycomb-ui</feature>
+    <feature version='${project.version}'>odl-honeycomb-v3po-rest</feature>
+  </feature>
+
+</features>
diff --git a/vpp-integration/karaf/pom.xml b/vpp-integration/karaf/pom.xml
new file mode 100644
index 000000000..1232e7375
--- /dev/null
+++ b/vpp-integration/karaf/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2015 Cisco and/or its affiliates.
+ 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.
+-->
+<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">
+  <parent>
+    <groupId>io.fd.honeycomb.common</groupId>
+    <artifactId>karaf-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../common/karaf-parent</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.fd.honeycomb.vpp.integration</groupId>
+  <artifactId>vpp-integration-karaf</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <properties>
+    <karaf.localFeature>honeycomb-vpp-integration-rest</karaf.localFeature>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <!-- scope is compile so all features (there is only one) are installed
+      into startup.properties and the feature repo itself is not installed -->
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <type>kar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>honeycomb-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb.vpp</groupId>
+      <artifactId>vpp-common-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb.v3po</groupId>
+      <artifactId>v3po-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.fd.honeycomb.vpp.integration</groupId>
+      <artifactId>vpp-integration-features</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  <!-- DO NOT install or deploy the karaf artifact -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml
new file mode 100644
index 000000000..7b900e7ea
--- /dev/null
+++ b/vpp-integration/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2015 Cisco and/or its affiliates.
+ 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.
+-->
+<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">
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.6.2-Beryllium-SR2</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>io.fd.honeycomb.vpp.integration</groupId>
+  <artifactId>vpp-integration</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <modules>
+    <module>features</module>
+    <module>karaf</module>
+  </modules>
+  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
-- 
cgit 1.2.3-korg