From a18be2fb495ef6b5c2571dd184cfa26582f545ca Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:41:24 +0200
Subject: [PATCH 01/10] Chamge dependencies model
---
.../_install => _install}/dependency.xml | 0
module/_install/dependency.xml | 20 -------------------
2 files changed, 20 deletions(-)
rename {web_service/_install => _install}/dependency.xml (100%)
delete mode 100755 module/_install/dependency.xml
diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 100%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
diff --git a/module/_install/dependency.xml b/module/_install/dependency.xml
deleted file mode 100755
index 889d6d3c..00000000
--- a/module/_install/dependency.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Module vMap -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>core</nature>
- <version>2018.03.00</version>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>vmap</name>
- <version>2018.02.00</version>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>anc</name>
- <version>2018.02.00</version>
- </dependency>
- </dependenciesCollection>
-</installer>
--
GitLab
From 12a17e13ea3fa1e6615991636338b87e745fc5a1 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:42:11 +0200
Subject: [PATCH 02/10] Change dependencies model
---
_install/dependency.xml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index b9dc841e..b4c6b83a 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,12 +3,10 @@
<installer>
<schema>
<name>s_anc</name>
- <version>2018.02.00</version>
<dependenciesCollection>
<dependency>
<nature>schema</nature>
<name>s_vitis</name>
- <version>2018.03.00</version>
<object>vas</object>
</dependency>
<dependency>
@@ -20,8 +18,15 @@
</schema>
<dependenciesCollection>
<dependency>
- <nature>vas</nature>
- <version>2018.03.00</version>
+ <nature>framework</nature>
+ </dependency>
+ <dependency>
+ <nature>web_services</nature>
+ <name>module_vmap</name>
+ </dependency>
+ <dependency>
+ <nature>web_services</nature>
+ <name>module_anc</name>
</dependency>
</dependenciesCollection>
</installer>
--
GitLab
From 54d83afe05ec1e70d7c2fb703ae74c6a3fc09195 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 15:02:56 +0000
Subject: [PATCH 03/10] Update dependency.xml
---
_install/dependency.xml | 60 +++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 32 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index b4c6b83a..72bcfeac 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,32 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS ANC -->
-<installer>
- <schema>
- <name>s_anc</name>
- <dependenciesCollection>
- <dependency>
- <nature>schema</nature>
- <name>s_vitis</name>
- <object>vas</object>
- </dependency>
- <dependency>
- <name>postgis</name>
- <version>2.0</version>
- <nature>extern-pre</nature>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <nature>framework</nature>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>module_vmap</name>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>module_anc</name>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS ANC -->
+<installer>
+ <schema>
+ <name>s_anc</name>
+ <dependenciesCollection>
+ <dependency>
+ <nature>schema</nature>
+ <name>s_vitis</name>
+ <object>vas</object>
+ </dependency>
+ <dependency>
+ <name>postgis</name>
+ <version>2.0</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <nature>framework</nature>
+ </dependency>
+ <dependency>
+ <nature>modules</nature>
+ <name>module_vmap</name>
+ </dependency>
+ </dependenciesCollection>
+</installer>
--
GitLab
From b05764f4a1bf719bdcc4c2ba4a918d67fd20a20c Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 15:13:21 +0000
Subject: [PATCH 04/10] Update dependency.xml
---
_install/dependency.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 72bcfeac..42435b86 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -19,6 +19,7 @@
<dependenciesCollection>
<dependency>
<nature>framework</nature>
+ <name>vitis</name>
</dependency>
<dependency>
<nature>modules</nature>
--
GitLab
From 80ef848893e77984b0a4599cbf3bebd56ece1bf6 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 14:01:11 +0000
Subject: [PATCH 05/10] Update dependency.xml
---
_install/dependency.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 42435b86..e1d40bb7 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -7,7 +7,7 @@
<dependency>
<nature>schema</nature>
<name>s_vitis</name>
- <object>vas</object>
+ <object>framework</object>
</dependency>
<dependency>
<name>postgis</name>
--
GitLab
From d374201c1d392f81c43e5547d18c79aeea57ba01 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 14:38:32 +0000
Subject: [PATCH 06/10] Update dependency.xml
---
_install/dependency.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index e1d40bb7..a2d29e14 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -7,7 +7,7 @@
<dependency>
<nature>schema</nature>
<name>s_vitis</name>
- <object>framework</object>
+ <object>vitis</object>
</dependency>
<dependency>
<name>postgis</name>
--
GitLab
From 3c167ff4dae7998396d500028d4a6cfedfcdff94 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 10:13:59 +0000
Subject: [PATCH 07/10] =?UTF-8?q?Ajout=20de=20la=20d=C3=A9pendance=20au=20?=
=?UTF-8?q?schema=20cadastre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_install/dependency.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index a2d29e14..6f15081e 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -9,6 +9,11 @@
<name>s_vitis</name>
<object>vitis</object>
</dependency>
+ <dependency>
+ <nature>schema</nature>
+ <name>s_cadastre</name>
+ <object>cadastreV2</object>
+ </dependency>
<dependency>
<name>postgis</name>
<version>2.0</version>
--
GitLab
From ab8db901058d10576d55f9972f1980d1928fbf11 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 10:19:48 +0000
Subject: [PATCH 08/10] Update dependency.xml
---
_install/dependency.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 6f15081e..7c9fc2f8 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -12,7 +12,7 @@
<dependency>
<nature>schema</nature>
<name>s_cadastre</name>
- <object>cadastreV2</object>
+ <object>module_cadastreV2</object>
</dependency>
<dependency>
<name>postgis</name>
--
GitLab
From 2feba72261e234d68d6ef1e788da2037fa89e0fc Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 14:18:52 +0200
Subject: [PATCH 09/10] Update from SVN
---
web_service/sql/sqlQueries.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
mode change 100755 => 100644 web_service/sql/sqlQueries.xml
diff --git a/web_service/sql/sqlQueries.xml b/web_service/sql/sqlQueries.xml
old mode 100755
new mode 100644
index 47fc554c..805842b8
--- a/web_service/sql/sqlQueries.xml
+++ b/web_service/sql/sqlQueries.xml
@@ -3098,5 +3098,21 @@
]]>
</code>
</query>
+ <query>
+ <type>init</type>
+ <version>2018.03.00</version>
+ <code>
+ <![CDATA[
+ ]]>
+ </code>
+ </query>
+ <query>
+ <type>init</type>
+ <version>2018.03.01</version>
+ <code>
+ <![CDATA[
+ ]]>
+ </code>
+ </query>
</queriesCollection>
</sqlQueries>
--
GitLab
From 7347d062a010a606fcd572ae71a5a73e38e1e163 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 14:33:03 +0200
Subject: [PATCH 10/10] Update from SVN
---
_install/dependency.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 7c9fc2f8..0b43e654 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS ANC -->
<installer>
<schema>
<name>s_anc</name>
--
GitLab