diff --git a/build.sh b/build.sh index f700a5ce55358f313861149226b15299459b809a..b8e878020a8550db9013427262c6d9b6184dd976 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 04c8f6dec6c4af1de6e79f5da9061d5abb293376..5060e0bfc4b4583587cd0f5d4b14e361320054c1 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 e7bb02f746329d8c18868f884bb4b9ca909b2514..fee11a2f426f91987d99e904782e2e9c558d37a6 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>