From 85460ef6e2cf948b78becee7e85e199ac7c6599c Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 8 Jul 2019 15:49:07 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02060=20[WIP]=20Initialisation=20of=20the?=
 =?UTF-8?q?=20portal=20application:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove old composer.json that was not necessary
- Add empty model.itop-portal-base.php file for future XML snippets to be loaded
- Increase module version number to 2.7.0
---
 .../2.x/itop-portal-base/_composer.json       | 22 -----------------
 .../model.itop-portal-base.php                | 24 +++++++++++++++++++
 .../module.itop-portal-base.php               |  7 ++----
 .../2.x/itop-portal/module.itop-portal.php    |  4 ++--
 4 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 datamodels/2.x/itop-portal-base/_composer.json
 create mode 100644 datamodels/2.x/itop-portal-base/model.itop-portal-base.php

diff --git a/datamodels/2.x/itop-portal-base/_composer.json b/datamodels/2.x/itop-portal-base/_composer.json
deleted file mode 100644
index 7af95a9a5..000000000
--- a/datamodels/2.x/itop-portal-base/_composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"require": {
-		"php": ">=5.6.0",
-		"symfony/symfony": "^3.4"
-	},
-	"config": {
-		"vendor-dir": "../../../lib/composer-vendor",
-		"platform": {
-			"php": "5.6.0"
-		}
-	},
-	"autoload": {
-		"psr-4": {
-			"Combodo\\iTop\\Portal\\": "portal/src/"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Combodo\\iTop\\Portal\\Tests\\": "tests/"
-		}
-	}
-}
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/model.itop-portal-base.php b/datamodels/2.x/itop-portal-base/model.itop-portal-base.php
new file mode 100644
index 000000000..8b598ae3d
--- /dev/null
+++ b/datamodels/2.x/itop-portal-base/model.itop-portal-base.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright (C) 2013-2019 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ *
+ *
+ */
+
+// This file may be amended with XML snippets
+
diff --git a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
index e00ee8240..b8e2a5a7c 100644
--- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
@@ -2,7 +2,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/2.6.1', array(
+	'itop-portal-base/2.7.0', array(
 	// Identification
 	'label' => 'Portal Development Library',
 		'category' => 'Portal',
@@ -13,10 +13,7 @@ SetupWebPage::AddModule(
 	'visible' => true,
 	// Components
 	'datamodel' => array(
-//		'portal/src/controllers/brickcontroller.class.inc.php',
-//		'portal/src/entities/abstractbrick.class.inc.php',
-//		'portal/src/entities/portalbrick.class.inc.php',
-//		'portal/src/routers/abstractrouter.class.inc.php',
+		'model.itop-portal-base.php',
 	),
 	'webservice' => array(
 	//'webservices.itop-portal-base.php',
diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php
index b8d948e83..99a58b41e 100644
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -2,13 +2,13 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/2.6.1', array(
+	'itop-portal/2.7.0', array(
 	// Identification
 	'label' => 'Enhanced Customer Portal',
 	'category' => 'Portal',
 	// Setup
 	'dependencies' => array(
-		'itop-portal-base/1.0.0'
+		'itop-portal-base/2.7.0'
 	),
 	'mandatory' => false,
 	'visible' => true,