Build ui and be together

Change-Id: I6ccc838cae0f157f21cfa2591cc3df4f982dbb8a
JIRA:VNFSDK-53
Signed-off-by: Murali-P <murali.p@huawei.com>

diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 39ef0e2..d09f92f 100644 (file)
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -58,7 +58,7 @@
 
                                 deployFolder = "${project.build.directory}/deployoutput"
                                 deployUnzip = "${project.build.directory}/deployunzip"
-                                outfileName = "VnfSdkMarketplace-.${project.version}.zip"
+                                outfileName = "VnfSdkMarketplace-${project.version}.zip"
 
                                 ant.delete(dir: "${deployFolder}")
                                 ant.mkdir(dir: "${deployFolder}")
@@ -67,7 +67,7 @@
                                 ant.mkdir(dir: "${deployUnzip}")
 
                                 ant.mkdir(dir: "${deployUnzip}/webapps/ROOT")
-                                ant.mkdir(dir: "${deployUnzip}/webapps/openoui#marketplace#v1")
+                                ant.mkdir(dir: "${deployUnzip}/webapps/openoui")
 
                                 ant.copy(todir: "${deployUnzip}") {
                                 fileset(dir: "${basedir}/src/main/release"){
@@ -77,6 +77,10 @@
 
                                 ant.copy(todir: "${deployUnzip}/webapps/ROOT") {
                                 fileset(dir: "${project.build.directory}/../../vnf-sdk-marketplace/target/ROOT")
+                                }
+                                                               
+                                                               ant.copy(todir: "${deployUnzip}/webapps/openoui") {
+                                fileset(dir: "${project.build.directory}/../../../vnfmarket/src/main/webapp")
                                 }
 
                                 ant.zip(destfile: "${deployFolder}/${outfileName}") {
@@ -101,7 +105,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>${project.build.directory}/deployoutput/VnfSdkMarketplace-.${project.version}.zip</file>
+                                    <file>${project.build.directory}/deployoutput/VnfSdkMarketplace-${project.version}.zip</file>
                                     <type>zip</type>
                                 </artifact>
                             </artifacts>