From 28ea33611905de7770721ed26a2c28bb7a685c4d Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@ericsson.com>
Date: Wed, 18 Jul 2018 16:28:07 +0100
Subject: Fix apex-pdp packaging issue

Fix apex-pdp packaging issue and add SampleDomain examples to try out
how apex-pdp works.

Change-Id: I4018b0902d06345e86ddbef80100e63232cee49d
Issue-ID: POLICY-861
Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
---
 packages/apex-pdp-package-full/pom.xml            | 20 +++++++++++++------
 pom.xml                                           |  1 +
 testsuites/integration/integration-common/pom.xml | 24 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index 2b05807e2..7bb3a7b1d 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -162,9 +162,15 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!-- Test Data used by examples -->
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>utilities</artifactId>
+            <groupId>org.onap.policy.apex-pdp.context</groupId>
+            <artifactId>context-test-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
+            <artifactId>integration-common</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
@@ -187,18 +193,20 @@
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.auth</groupId>
                                     <artifactId>cli-editor</artifactId>
+                                    <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.model</groupId>
-                                    <artifactId>utilities</artifactId>
+                                    <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
+                                    <artifactId>integration-common</artifactId>
+                                    <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
-                                    <includes>/app-version.txt</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                             </artifactItems>
                             <overWriteReleases>true</overWriteReleases>
diff --git a/pom.xml b/pom.xml
index a07dc79ad..b983c6cf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,7 @@
                                                 <versionRange>[1.6.0,)</versionRange>
                                                 <goals>
                                                     <goal>java</goal>
+                                                    <goal>exec</goal>
                                                 </goals>
                                             </pluginExecutionFilter>
                                             <action>
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index 20be79afb..46f913b60 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -70,6 +70,30 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-models</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>java</executable>
+                            <classpathScope>test</classpathScope>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <!-- automatically creates the classpath using all project dependencies, also adding the project build directory -->
+                                <classpath />
+                                <argument>org.onap.policy.apex.test.common.model.SampleDomainModelSaver</argument>
+                                <argument>${project.build.directory}/classes/examples/models/SampleDomain</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-- 
cgit 1.2.3-korg