From 2cdc14b50161123d103b832600da88dc8fcb7eb6 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Thu, 9 Feb 2017 17:20:28 +0100
Subject: [PATCH] Add odl-karaf-feat-jetty and odl-karaf-feat-feature

Jetty is yet another feature we are using, provide a proxy for it.
Also note that we should be upgrading it.

feature service is needed by config-adaptor in controller, so add
that as well.

Change-Id: Idb5049ca822f9fb2a7383e79ca04d40c37eaa8eb
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 features4/features4-odlparent/pom.xml         |  7 +++
 features4/odl-karaf-feat-feature/pom.xml      | 60 +++++++++++++++++++
 .../src/main/feature/feature.xml              | 14 +++++
 features4/odl-karaf-feat-jetty/pom.xml        | 60 +++++++++++++++++++
 .../src/main/feature/feature.xml              | 15 +++++
 features4/pom.xml                             |  2 +
 odlparent-artifacts/pom.xml                   | 14 +++++
 7 files changed, 172 insertions(+)
 create mode 100644 features4/odl-karaf-feat-feature/pom.xml
 create mode 100644 features4/odl-karaf-feat-feature/src/main/feature/feature.xml
 create mode 100644 features4/odl-karaf-feat-jetty/pom.xml
 create mode 100644 features4/odl-karaf-feat-jetty/src/main/feature/feature.xml

diff --git a/features4/features4-odlparent/pom.xml b/features4/features4-odlparent/pom.xml
index 9b380e949..9c531917c 100644
--- a/features4/features4-odlparent/pom.xml
+++ b/features4/features4-odlparent/pom.xml
@@ -70,6 +70,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-karaf-feat-jetty</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-karaf-feat-war</artifactId>
diff --git a/features4/odl-karaf-feat-feature/pom.xml b/features4/odl-karaf-feat-feature/pom.xml
new file mode 100644
index 000000000..f286672df
--- /dev/null
+++ b/features4/odl-karaf-feat-feature/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Red Hat, 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>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-karaf-feat-feature</artifactId>
+    <packaging>kar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <version>${karaf4.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/feature</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+
+</project>
diff --git a/features4/odl-karaf-feat-feature/src/main/feature/feature.xml b/features4/odl-karaf-feat-feature/src/main/feature/feature.xml
new file mode 100644
index 000000000..a8983a327
--- /dev/null
+++ b/features4/odl-karaf-feat-feature/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, 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
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-karaf-feat-feature">
+    <feature name="odl-karaf-feat-feature" version="${project.version}">
+        <feature dependency="true" prerequisite="true">feature</feature>
+    </feature>
+</features>
diff --git a/features4/odl-karaf-feat-jetty/pom.xml b/features4/odl-karaf-feat-jetty/pom.xml
new file mode 100644
index 000000000..5a68bd713
--- /dev/null
+++ b/features4/odl-karaf-feat-jetty/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Red Hat, 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>single-feature-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-karaf-feat-jetty</artifactId>
+    <packaging>kar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <version>${karaf4.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/feature</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+
+</project>
diff --git a/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml b/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml
new file mode 100644
index 000000000..1a6082bf8
--- /dev/null
+++ b/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2017 Cisco Systems, 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
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-karaf-feat-jetty">
+    <feature name="odl-karaf-feat-jetty" version="${project.version}">
+        <!-- FIXME: upgrade to 9.2.19.v20160908 -->
+        <feature dependency="true" version="8.1.14.v20131031">jetty</feature>
+    </feature>
+</features>
diff --git a/features4/pom.xml b/features4/pom.xml
index dffd49d81..c872e8f68 100644
--- a/features4/pom.xml
+++ b/features4/pom.xml
@@ -35,7 +35,9 @@
         <module>odl-akka-system-2.4</module>
 
         <!-- Proxy features for Karaf-provided features -->
+        <module>odl-karaf-feat-feature</module>
         <module>odl-karaf-feat-jdbc</module>
+        <module>odl-karaf-feat-jetty</module>
         <module>odl-karaf-feat-war</module>
 
         <!-- General features -->
diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 3b3e518dd..51ea81b2e 100644
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -131,6 +131,13 @@
                 <type>xml</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-karaf-feat-feature</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-karaf-feat-jdbc</artifactId>
@@ -138,6 +145,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-karaf-feat-jetty</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-karaf-feat-war</artifactId>
-- 
2.36.6