diff --git a/.gitignore b/.gitignore
index d8b5d9919508b3efbd1b1fdc1d91adb22b53876d..3197de7543d416ed1e6766c8e001ac9d61972146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,6 @@
-client
-vas
+vas/
+client/
conf/closure
conf/node_modules/
conf/properties.json
-src/closure/conf/depswriter/
-src/vitis/vas/log/
-src/vitis/vas/public/
-src/vitis/vas/server/
-src/vitis/vas/ws_data/
-src/vitis/vas/tmp/
-src/vitis/client/modules/
-! src/vitis/client/modules/vitis/
-src/vitis/vas/rest/ws/*
-! src/vitis/vas/rest/ws/vitis/
-src/vitis/vas/sql/*
-! src/vitis/vas/sql/sqlQueries.xml
+src/closure/
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index c98ed30e162c2d81c8b90e5b6755bb5602941b5e..217081b5183c9fd2eded79405d69dede6c74a7ee 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -19,20 +19,56 @@ read APP_EXISTING_PATH
cd ..
+# Supprime les anciens symlinks
+if [ -d "client" ]; then
+ rm -Rf client
+fi
+if [ -d "vas" ]; then
+ rm -Rf vas
+fi
+find src/vitis/client -type l -delete
+find src/vitis/vas/sql -type l -delete
+find src/vitis/vas/rest -type l -delete
+
# Vitis
echo "---- Link vitis ----"
if ! [ -e "$(pwd)/client" ]; then
- echo "---- Link vitis 2 ----"
- ln -rsf src/vitis/client client
+
+ mkdir client
+ mkdir client/javascript
+ mkdir client/modules
+ ln -rsf src/vitis/client/css client/css
+ ln -rsf src/vitis/client/forms client/forms
+ ln -rsf src/vitis/client/images client/images
+ ln -rsf src/vitis/client/javascript/app client/javascript/app
+ ln -rsf src/vitis/client/javascript/externs client/javascript/externs
+ ln -rsf src/vitis/client/javascript/require client/javascript/require
+ ln -rsf src/vitis/client/lang client/lang
+ ln -rsf src/vitis/client/less client/less
+ ln -rsf src/vitis/client/modules/vitis client/modules/vitis
+ ln -rsf src/vitis/client/templates client/templates
+ ln -rsf src/vitis/client/.htaccess client/.htaccess
+ ln -rsf src/vitis/client/index.html client/index.html
fi
if ! [ -e "$(pwd)/vas" ]; then
- ln -rsf src/vitis/vas vas
+
+ mkdir vas
+ mkdir vas/rest
+ mkdir vas/rest/ws
+ ln -rsf src/vitis/vas/doc vas/doc
+ ln -rsf src/vitis/vas/rest/class vas/rest/class
+ ln -rsf src/vitis/vas/rest/inc vas/rest/inc
+ ln -rsf src/vitis/vas/rest/ws/vitis vas/rest/ws/vitis
+ ln -rsf src/vitis/vas/rest/index.phtml vas/rest/index.phtml
+ ln -rsf src/vitis/vas/rest/index.vhtml vas/rest/index.vhtml
+ ln -rsf src/vitis/vas/sql vas/sql
+ ln -rsf src/vitis/vas/util vas/util
fi
# Conf
echo "---- Link conf ----"
if ! [ -e "src/vitis/client/conf" ]; then
- ln -rsf conf src/vitis/client/conf
+ ln -rsf conf client/conf
fi
if ! [ -e "conf/closure" ]; then
ln -rsf src/closure/conf conf/closure
@@ -47,22 +83,17 @@ if [[ $depsCount > 0 ]]; then
echo "---- Link module_${module} ----"
if [ -d "$(pwd)/src/module_${module}/module" ]; then
if ! [ -e "src/vitis/client/modules/${module}" ]; then
- ln -rsf src/module_${module}/module src/vitis/client/modules/${module}
+ ln -rsf src/module_${module}/module client/modules/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then
if ! [ -e "src/vitis/vas/rest/ws/${module}" ]; then
- ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
- fi
- fi
- if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
- if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
- ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
+ ln -rsf src/module_${module}/web_service/ws vas/rest/ws/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
if ! [ -e "src/vitis/vas/sql/${module}" ]; then
- ln -rsf src/module_${module}/web_service/sql src/vitis/vas/sql/${module}
+ ln -rsf src/module_${module}/web_service/sql vas/sql/${module}
fi
fi
if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; then
@@ -70,7 +101,7 @@ if [[ $depsCount > 0 ]]; then
if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then
echo "---- Link module_${module}/${class_dir} ----"
if ! [ -e "src/vitis/vas/rest/class/${class_dir}" ]; then
- ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir}
+ ln -rsf src/module_${module}/web_service/class/${class_dir} vas/rest/class/${class_dir}
fi
fi
done
@@ -84,6 +115,7 @@ if [[ $depsCount > 0 ]]; then
echo "---- Link exixting app ${APP_EXISTING_PATH} ----"
declare -a existing_folders_path=("vas/server"
+ "vas/rest/conf"
"vas/log"
"vas/public"
"vas/shared"
@@ -99,11 +131,6 @@ if [[ $depsCount > 0 ]]; then
done
declare -a existing_files_path=("client/conf/properties.json"
- "vas/rest/conf/properties.inc"
- "vas/rest/conf/properties_domain.inc"
- "vas/rest/conf/properties_post.inc"
- "vas/rest/conf/properties_server.inc"
- "vas/rest/conf/version.inc"
"vas/rest/.htaccess")
for file_path in "${existing_files_path[@]}"; do
if [ -f "${APP_EXISTING_PATH}/$file_path" ]; then
@@ -114,15 +141,8 @@ if [[ $depsCount > 0 ]]; then
for properties_dir in $( ls "${APP_EXISTING_PATH}/vas/rest/conf"); do
if [ -d "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}" ]; then
- if [ -d "$(pwd)/vas/rest/conf/${properties_dir}" ]; then
- for properties_file in $( ls "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}"); do
- # if [ ${properties_file:0:10}=="properties" || ${properties_file}=="version.inc" ]; then
- if [[ $properties_file == "properties"* ]] || [[ $properties_file == "version.inc" ]]; then
- echo "copy vas/rest/conf/${properties_dir}/${properties_file}"
- cp -f "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/${properties_file}" "$(pwd)/vas/rest/conf/${properties_dir}/${properties_file}"
- fi
- done
- fi
+ echo "copy ${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/ > $(pwd)/vas/rest/conf/"
+ cp -Rf "${APP_EXISTING_PATH}/vas/rest/conf/${properties_dir}/" "$(pwd)/vas/rest/conf/"
fi
done
fi