Adding examples-servlet module to apex-pdp

Adding examples-servlet module to demonstrate the capability that
apex-pdp can be simply started as a servlet deployed in any application
server.

Change-Id: I5c9e323f1468cc14c6277c0037029679d00cd751
Issue-ID: POLICY-861
Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>

2 files changed, 135 insertions, 93 deletions

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index bb0beee9f..2ec77f73a 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -210,6 +210,12 @@
             <artifactId>examples-onap-vcpe</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.examples</groupId>
+            <artifactId>examples-servlet</artifactId>
+            <type>war</type>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -308,6 +314,15 @@
                                     <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>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
+                                    <includes>/readme_examples-servlet.txt</includes>
+                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>true</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
@@ -411,6 +426,15 @@
                                     </mapper>
                                 </data>
                                 <data>
+                                    <src>${project.build.directory}/install_hierarchy/war</src>
+                                    <type>directory</type>
+                                    <dst>etc</dst>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/opt/app/policy/apex-pdp/${install.package.name}-${project.version}/war</prefix>
+                                    </mapper>
+                                </data>
+                                <data>
                                     <src>${project.build.directory}/install_hierarchy/examples</src>
                                     <type>directory</type>
                                     <dst>etc</dst>
@@ -498,6 +522,16 @@
                                     </sources>
                                 </mapping>
                                 <mapping>
+                                    <directory>/opt/app/policy/apex-pdp/${install.package.name}-${project.version}/war</directory>
+                                    <username>root</username>
+                                    <groupname>root</groupname>
+                                    <sources>
+                                        <source>
+                                            <location>${project.build.directory}/install_hierarchy/war</location>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
                                     <directory>/opt/app/policy/apex-pdp/${project.artifactId}-${project.version}/examples</directory>
                                     <username>root</username>
                                     <groupname>root</groupname>
diff --git a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
index cd242f33c..1080506b6 100644
--- a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
+++ b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml
@@ -18,97 +18,105 @@
   ============LICENSE_END=========================================================
 -->
 <assembly>
-	<id>tarball</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<dependencySets>
-		<dependencySet>
-			<useProjectArtifact>true</useProjectArtifact>
-			<outputDirectory>/lib</outputDirectory>
-			<unpack>false</unpack>
-			<scope>runtime</scope>
-			<includes>
-				<include>*:jar</include>
-			</includes>
-		</dependencySet>
-		<dependencySet>
-			<useProjectArtifact>true</useProjectArtifact>
-			<outputDirectory>/war</outputDirectory>
-			<unpack>false</unpack>
-			<scope>runtime</scope>
-			<includes>
-				<include>*:war</include>
-			</includes>
-		</dependencySet>
-	</dependencySets>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/src/main/package/scripts</directory>
-			<includes>
-				<include>*</include>
-			</includes>
-			<outputDirectory>/bin</outputDirectory>
-			<fileMode>0755</fileMode>
-			<lineEnding>unix</lineEnding>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/src/main/resources</directory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<outputDirectory>/etc</outputDirectory>
-			<lineEnding>unix</lineEnding>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/src/main/package/examples</directory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<outputDirectory>/examples</outputDirectory>
-			<lineEnding>unix</lineEnding>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/etc</directory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<outputDirectory>/etc</outputDirectory>
-			<lineEnding>unix</lineEnding>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/examples</directory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<outputDirectory>/examples</outputDirectory>
-			<lineEnding>unix</lineEnding>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}/lib</directory>
-			<includes>
-				<include>**/*</include>
-			</includes>
-			<outputDirectory>/lib</outputDirectory>
-			<excludes>
-				<exclude>*.formatted</exclude>
-			</excludes>
-		</fileSet>
-	</fileSets>
+    <id>tarball</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>*:jar</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>/war</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>*:war</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/package/scripts</directory>
+            <includes>
+                <include>*</include>
+            </includes>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/etc</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/package/examples</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/examples</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/etc</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/etc</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/examples</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/examples</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/lib</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>/lib</outputDirectory>
+            <excludes>
+                <exclude>*.formatted</exclude>
+            </excludes>
+        </fileSet>
+        <!-- Just to keep readme & war file in the same directory -->
+        <fileSet>
+            <directory>${project.build.directory}/etc</directory>
+            <includes>
+                <include>readme_examples-servlet.txt</include>
+            </includes>
+            <outputDirectory>/war</outputDirectory>
+        </fileSet>
+    </fileSets>
 </assembly>