diff options
author | Murali-P <murali.p@huawei.com> | 2017-08-09 15:33:40 +0530 |
---|---|---|
committer | Murali-P <murali.p@huawei.com> | 2017-08-09 15:49:30 +0530 |
commit | e1afbe6179fb10f791977c5f35bf1773b4cb3329 (patch) | |
tree | fedfde7348a7674b84679c25e6103cdfcdd9a68e | |
parent | 4e60efd8c2cc56b7df1268f6b72c07897f28354b (diff) |
Build ui and be together
Change-Id: I6ccc838cae0f157f21cfa2591cc3df4f982dbb8a
JIRA:VNFSDK-53
Signed-off-by: Murali-P <murali.p@huawei.com>
-rw-r--r-- | vnfmarket-be/deployment/pom.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml index 39ef0e27..d09f92f0 100644 --- 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"){ @@ -78,6 +78,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}") { fileset(dir: "${deployUnzip}") @@ -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> |