From 87b86b4f9e5ef8a98c07cbd64318bc41bf312be5 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:47:42 +0200
Subject: [PATCH 1/9] Change 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 d0d0e9f1..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.05.00</version>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>vmap</name>
- <version>2018.03.00</version>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>vm4ms</name>
- <version>2018.03.00</version>
- </dependency>
- </dependenciesCollection>
-</installer>
--
GitLab
From 598189b5b5ab743838ac1b69a8343d8d83d3d1b0 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:47:51 +0200
Subject: [PATCH 2/9] Change dependencies model
---
_install/dependency.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index abacf151..05a99ca2 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,13 +3,11 @@
<installer>
<schema>
<name>s_vm4ms</name>
- <version>2018.03.00</version>
<dependenciesCollection>
<dependency>
<nature>schema</nature>
<name>s_vitis</name>
- <version>2018.05.00</version>
- <object>vas</object>
+ <object>framework</object>
</dependency>
</dependenciesCollection>
</schema>
@@ -25,13 +23,11 @@
<object>vm4ms</object>
</dependency>
<dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
+ <nature>framework</nature>
</dependency>
<dependency>
<nature>web_services</nature>
- <name>vmap</name>
- <version>2018.03.00</version>
+ <name>module_vmap</name>
</dependency>
<dependency>
<name>mapserver</name>
--
GitLab
From 7743bd81906dbb6a4d0dc4fae5eb34af2334e9ae Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 14:58:17 +0000
Subject: [PATCH 3/9] Update dependency.xml
---
_install/dependency.xml | 100 ++++++++++++++++++++--------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 05a99ca2..b4f37377 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS vMap -->
-<installer>
- <schema>
- <name>s_vm4ms</name>
- <dependenciesCollection>
- <dependency>
- <nature>schema</nature>
- <name>s_vitis</name>
- <object>framework</object>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <name>vm4ms-pre-install</name>
- <nature>extern-pre</nature>
- <object>vm4ms</object>
- </dependency>
- <dependency>
- <name>vm4ms-post-install</name>
- <nature>extern-post</nature>
- <object>vm4ms</object>
- </dependency>
- <dependency>
- <nature>framework</nature>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>module_vmap</name>
- </dependency>
- <dependency>
- <name>mapserver</name>
- <nature>extern-post</nature>
- <location>mapserver-7.0.7.1</location>
- </dependency>
- <!-- Dépendances de mapserver -->
- <dependency>
- <name>vcredist-mapserver</name>
- <nature>extern-pre</nature>
- <location>vcredist-10-86</location>
- </dependency>
- <dependency>
- <name>vcredist-gdal</name>
- <nature>extern-pre</nature>
- <location>vcredist-11</location>
- </dependency>
- <!-- Fin des dépendances de mapserver -->
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS vMap -->
+<installer>
+ <schema>
+ <name>s_vm4ms</name>
+ <dependenciesCollection>
+ <dependency>
+ <nature>schema</nature>
+ <name>s_vitis</name>
+ <object>framework</object>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <name>vm4ms-pre-install</name>
+ <nature>extern-pre</nature>
+ <object>vm4ms</object>
+ </dependency>
+ <dependency>
+ <name>vm4ms-post-install</name>
+ <nature>extern-post</nature>
+ <object>vm4ms</object>
+ </dependency>
+ <dependency>
+ <nature>framework</nature>
+ </dependency>
+ <dependency>
+ <nature>modules</nature>
+ <name>module_vmap</name>
+ </dependency>
+ <dependency>
+ <name>mapserver</name>
+ <nature>extern-post</nature>
+ <location>mapserver-7.0.7.1</location>
+ </dependency>
+ <!-- Dépendances de mapserver -->
+ <dependency>
+ <name>vcredist-mapserver</name>
+ <nature>extern-pre</nature>
+ <location>vcredist-10-86</location>
+ </dependency>
+ <dependency>
+ <name>vcredist-gdal</name>
+ <nature>extern-pre</nature>
+ <location>vcredist-11</location>
+ </dependency>
+ <!-- Fin des dépendances de mapserver -->
+ </dependenciesCollection>
+</installer>
--
GitLab
From 2c489f996dec2bd6adfe34c5b273bae084cb0f18 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 15:13:46 +0000
Subject: [PATCH 4/9] Update dependency.xml
---
_install/dependency.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index b4f37377..25f2d733 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -24,6 +24,7 @@
</dependency>
<dependency>
<nature>framework</nature>
+ <name>vitis</name>
</dependency>
<dependency>
<nature>modules</nature>
--
GitLab
From 189e0e6d3a9fe5d43093a8948fbdd67617511f31 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Mon, 8 Oct 2018 14:08:34 +0000
Subject: [PATCH 5/9] Update dependency.xml
---
_install/dependency.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 25f2d733..af2eba5f 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -15,12 +15,12 @@
<dependency>
<name>vm4ms-pre-install</name>
<nature>extern-pre</nature>
- <object>vm4ms</object>
+ <object>module_vm4ms</object>
</dependency>
<dependency>
<name>vm4ms-post-install</name>
<nature>extern-post</nature>
- <object>vm4ms</object>
+ <object>module_vm4ms</object>
</dependency>
<dependency>
<nature>framework</nature>
--
GitLab
From b03d7e50603b897dc7c9426ffe03148d607e81ac Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 08:50:45 +0000
Subject: [PATCH 6/9] Update dependency.xml
---
_install/dependency.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index af2eba5f..4a6f57c0 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -13,12 +13,12 @@
</schema>
<dependenciesCollection>
<dependency>
- <name>vm4ms-pre-install</name>
+ <name>module_vm4ms-pre-install</name>
<nature>extern-pre</nature>
<object>module_vm4ms</object>
</dependency>
<dependency>
- <name>vm4ms-post-install</name>
+ <name>module_vm4ms-post-install</name>
<nature>extern-post</nature>
<object>module_vm4ms</object>
</dependency>
--
GitLab
From 003395538ae41d02659a636032d3e61eb9e782cd Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 09:00:57 +0000
Subject: [PATCH 7/9] Update dependency.xml
---
_install/dependency.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 4a6f57c0..af2eba5f 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -13,12 +13,12 @@
</schema>
<dependenciesCollection>
<dependency>
- <name>module_vm4ms-pre-install</name>
+ <name>vm4ms-pre-install</name>
<nature>extern-pre</nature>
<object>module_vm4ms</object>
</dependency>
<dependency>
- <name>module_vm4ms-post-install</name>
+ <name>vm4ms-post-install</name>
<nature>extern-post</nature>
<object>module_vm4ms</object>
</dependency>
--
GitLab
From 9b7aed87080a039ce9b1c7bbf9f3656ce39b8813 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 14:38:38 +0000
Subject: [PATCH 8/9] 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 af2eba5f..227abf73 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>
</dependenciesCollection>
</schema>
--
GitLab
From 1a7d90a05478d4e83c7597374419c388f342a8ff Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 16:47:08 +0200
Subject: [PATCH 9/9] Update from SVN
---
module/CHANGE_LOG.txt | 8 --------
web_service/CHANGE_LOG.txt | 8 --------
2 files changed, 16 deletions(-)
delete mode 100755 module/CHANGE_LOG.txt
delete mode 100755 web_service/CHANGE_LOG.txt
diff --git a/module/CHANGE_LOG.txt b/module/CHANGE_LOG.txt
deleted file mode 100755
index 98d7e0f1..00000000
--- a/module/CHANGE_LOG.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- + +
- + VEREMES - vm4ms change log +
- + +
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-b21193|RELEASE |vm4ms| Version 2017.01.00
\ No newline at end of file
diff --git a/web_service/CHANGE_LOG.txt b/web_service/CHANGE_LOG.txt
deleted file mode 100755
index 98d7e0f1..00000000
--- a/web_service/CHANGE_LOG.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- + +
- + VEREMES - vm4ms change log +
- + +
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-b21193|RELEASE |vm4ms| Version 2017.01.00
\ No newline at end of file
--
GitLab