From 8b47e8e69f112cbaa17f8b988b6bbdfec86f17a2 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 15:34:22 +0200
Subject: [PATCH] Squashed 'src/module_cadastreV2/' changes from
812b365..3bf002c
3bf002c Update dependency.xml
ecf80b3 Update dependency.xml
ce4f3cc Change dependencies model
832eb3b Change dependencies model
git-subtree-dir: src/module_cadastreV2
git-subtree-split: 3bf002c4ce9a7a640a2cef7d8e0279a1018a7811
---
.../_install => _install}/apache.conf | 0
.../_install => _install}/dependency.xml | 81 +++++++++----------
2 files changed, 39 insertions(+), 42 deletions(-)
rename {web_service/_install => _install}/apache.conf (100%)
rename {web_service/_install => _install}/dependency.xml (72%)
diff --git a/web_service/_install/apache.conf b/_install/apache.conf
similarity index 100%
rename from web_service/_install/apache.conf
rename to _install/apache.conf
diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 72%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
index 7c49bafb..d19305d0 100644
--- a/web_service/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS cadastreV2 -->
-<installer>
- <schema>
- <name>s_cadastre</name>
- <version>2018.02.01</version>
- <dependenciesCollection>
- <dependency>
- <nature>schema</nature>
- <name>s_vmap</name>
- <version>2018.03.00</version>
- <object>vmap</object>
- </dependency>
- <dependency>
- <name>postgis</name>
- <version>2.0</version>
- <nature>extern-pre</nature>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>vmap</name>
- <version>2018.03.00</version>
- </dependency>
- <dependency>
- <name>jre</name>
- <nature>extern-post</nature>
- <location>jre-8u101</location>
- </dependency>
- <dependency>
- <name>fop</name>
- <nature>extern-post</nature>
- <location>fop-2.0</location>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS cadastreV2 -->
+<installer>
+ <schema>
+ <name>s_cadastre</name>
+ <dependenciesCollection>
+ <dependency>
+ <nature>schema</nature>
+ <name>s_vmap</name>
+ <object>module_vmap</object>
+ </dependency>
+ <dependency>
+ <name>postgis</name>
+ <version>2.0</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <nature>framework</nature>
+ <name>vitis</name>
+ </dependency>
+ <dependency>
+ <nature>modules</nature>
+ <name>module_vmap</name>
+ </dependency>
+ <dependency>
+ <name>jre</name>
+ <nature>extern-post</nature>
+ <location>jre-8u101</location>
+ </dependency>
+ <dependency>
+ <name>fop</name>
+ <nature>extern-post</nature>
+ <location>fop-2.0</location>
+ </dependency>
+ </dependenciesCollection>
+</installer>
--
GitLab