From 1d4105bc6219ecf5908ffe3bcdaaf70446e4c02d Mon Sep 17 00:00:00 2001
From: Ayoub Zayati <azayati@exoplatform.com>
Date: Mon, 27 Nov 2023 16:43:15 +0100
Subject: [PATCH] fix: Fix merge MIPs-88 - Meeds-io/MIPs#88

---
 .../webapp/WEB-INF/conf/configuration.xml     |  1 -
 .../conf/wallet/portal-configuration.xml      | 56 -------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml

diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
index eda88a5e6..f1701d8de 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -24,7 +24,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <import>war:/conf/wallet/cache-configuration.xml</import>
   <import>war:/conf/wallet/bundle-configuration.xml</import>
   <import>war:/conf/wallet/organization-configuration.xml</import>  
-  <import>war:/conf/wallet/portal-configuration.xml</import>
   <import>war:/conf/wallet/dynamic-container-configuration.xml</import>
   <import>war:/conf/wallet/application-registry-configuration.xml</import>
   <import>war:/conf/wallet/user-page-configuration.xml</import>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml
deleted file mode 100644
index 0a0e47e75..000000000
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/portal-configuration.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program 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
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
--->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
-  <external-component-plugins>
-    <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
-    <component-plugin>
-      <name>new.portal.config.user.listener</name>
-      <set-method>initListener</set-method>
-      <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
-      <description>this listener init the portal configuration</description>
-      <priority>780</priority>
-      <init-params>
-        <object-param>
-          <name>portal.configuration</name>
-          <object type="org.exoplatform.portal.config.NewPortalConfig">
-            <field name="predefinedOwner">
-              <collection type="java.util.HashSet">
-                <value>
-                  <string>administration</string>
-                </value>
-              </collection>
-            </field>
-            <field name="ownerType">
-              <string>portal</string>
-            </field>
-            <field name="templateLocation">
-              <string>war:/conf/wallet/portal</string>
-            </field>
-            <field name="override">
-              <boolean>${exo.wallet.portalConfig.administration.override:true}</boolean>
-            </field>
-            <field name="importMode">
-              <string>${exo.wallet.portalConfig.administration.importmode:insert}</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>