From 3595f7c277778a64d1d828b66ed8127d92c010b5 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Thu, 27 Sep 2018 15:40:13 +0100
Subject: Add missing example policy models to install

The policy models for the decision maker, periodic, and
vCPE examples were not included in the install because the
policy model json files are generated from CLI commands.
THis review installs the generated policy models.

Issue-ID: POLICY-954
Change-Id: Ie2076ddfb6199dac0c8b272de8d7c47f1652485e
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 packages/apex-pdp-package-full/pom.xml             | 27 ++++++++++++++++++++++
 .../model/generator/model2cli/Model2CliMain.java   |  4 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 070d2d86f..8f788127a 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -334,6 +334,15 @@
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
+                                    <artifactId>examples-decisionmaker</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/examples/models/DecisionMaker</outputDirectory>
+                                    <includes>DecisionMakerPolicyModel.json</includes>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <artifactId>examples-periodic</artifactId>
@@ -343,6 +352,15 @@
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
+                                    <artifactId>examples-periodic</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/examples/models/Periodic</outputDirectory>
+                                    <includes>PeriodicPolicyModel.json</includes>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <artifactId>examples-onap-vcpe</artifactId>
@@ -352,6 +370,15 @@
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
+                                    <artifactId>examples-onap-vcpe</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/examples/models/ONAPvCPE</outputDirectory>
+                                    <includes>ONAPvCPEPolicyModel.json</includes>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <artifactId>examples-servlet</artifactId>
diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java
index 5c40b029b..1fd96b9ea 100644
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java
@@ -121,12 +121,12 @@ public final class Model2CliMain {
      */
     private String getHelpString(final CliParser cli) {
         HelpFormatter formatter = new HelpFormatter();
-      
+
         final StringWriter helpStringWriter = new StringWriter();
         final PrintWriter helpPrintWriter = new PrintWriter(helpStringWriter);
 
         formatter.printHelp(helpPrintWriter, 120, APP_NAME, APP_DESCRIPTION, cli.getOptions(), 2, 4, "");
-        
+
         return helpStringWriter.toString();
     }
 
-- 
cgit 1.2.3-korg