N°2060 [WIP] Initialisation of the portal application:

- 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

datamodels/2.x/itop-portal-base/_composer.json

@@ -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/"
-		}
-	}
-}

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
+

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',

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,