From 4ed0c8e9ddd65424f14d0d60acc6dcc7322dcfff Mon Sep 17 00:00:00 2001
From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Fri, 29 Mar 2019 10:35:11 +0100
Subject: SDN-R preload schema cache

installer pom extended to add related subdirectory

Change-Id: Ib092f4fd10f363073091fe0c3682d2b25e231d75
Issue-ID: SDNC-715
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
---
 sdnr/wt/featureaggregator/feature/pom.xml   |  7 +++----
 sdnr/wt/featureaggregator/installer/pom.xml | 29 ++++++++++++++++++++++++++---
 sdnr/wt/featureaggregator/pom.xml           |  6 ++++--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index 09cc5aa4c..ec69487a1 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -19,7 +19,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
 -->
-<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">
+<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>
 
   <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -32,7 +33,7 @@
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>single-feature-parent</artifactId>
     <version>1.2.2-SNAPSHOT</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <dependencyManagement>
@@ -83,7 +84,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-<!--
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sdnr-wt-odlux-core-feature</artifactId>
@@ -98,6 +98,5 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
--->
   </dependencies>
 </project>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index ca714c42f..623073074 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -19,7 +19,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
 -->
-<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">
+<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>
 
   <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -32,7 +34,7 @@
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
     <version>1.2.2-SNAPSHOT</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <properties>
@@ -42,7 +44,7 @@
   </properties>
 
   <dependencies>
-      <dependency>
+    <dependency>
       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
       <artifactId>${application.name}</artifactId>
       <version>${project.version}</version>
@@ -119,6 +121,27 @@
               <copyPom>false</copyPom>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-cache-schema</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+                  <artifactId>sdnr-wt-devicemanager-provider</artifactId>
+                  <version>0.4.2-SNAPSHOT</version>
+                  <type>jar</type>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+              <includes>preload.cache.schema/**</includes>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index cc9aa4ae5..3121490f6 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -19,7 +19,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
 -->
-<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">
+<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>
 
   <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
@@ -32,7 +34,7 @@
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
     <version>1.2.2-SNAPSHOT</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <modules>
-- 
cgit 1.2.3-korg