From 2a2fa619901cf558f279416702a20c482ea3ff02 Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Thu, 25 Feb 2016 22:30:18 +0100
Subject: [PATCH] updated build script to copy ui to backend war
---
build.sh | 2 ++
vipra-backend/.gitignore | 2 +-
vipra-backend/.settings/org.eclipse.wst.common.component | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index f700a5ce..b8e87802 100755
--- a/build.sh
+++ b/build.sh
@@ -56,6 +56,8 @@ echo "compiling vipra-ui" | tee -a $LOG
echo "-------------------------------" >> $LOG
cd ./vipra-ui
./build.sh >> $LOG 2>&1
+rm -rf ../vipra-backend/src/main/public
+cp -r public ../vipra-backend/src/main/public
cd ..
if [ $? -ne 0 ]; then
echo "error"
diff --git a/vipra-backend/.gitignore b/vipra-backend/.gitignore
index 04c8f6de..5060e0bf 100644
--- a/vipra-backend/.gitignore
+++ b/vipra-backend/.gitignore
@@ -1,3 +1,3 @@
*.class
/target/
-/src/main/webapp/public/
+/src/main/public/
\ No newline at end of file
diff --git a/vipra-backend/.settings/org.eclipse.wst.common.component b/vipra-backend/.settings/org.eclipse.wst.common.component
index e7bb02f7..fee11a2f 100644
--- a/vipra-backend/.settings/org.eclipse.wst.common.component
+++ b/vipra-backend/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,8 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/" source-path="/src/main/public"/>
<dependent-module archiveName="util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util">
<dependency-type>uses</dependency-type>
</dependent-module>
--
GitLab