web-ui/src/main/resources/catalog/locales/en-admin.json

@@ -832,21 +832,6 @@
     "system/server/protocol": "Preferred Protocol",
     "system/server/securePort": "Secure Port",
     "system/server/log": "Log level",
-    "system/shib": "Shibboleth",
-    "system/shib/attrib": "Shibboleth attribute mapping",
-    "system/shib/defaultGroup": "Default group",
-    "system/shib/email": "Email",
-    "system/shib/firstname": "Firstname",
-    "system/shib/fullName": "Fullname",
-    "system/shib/group": "Group",
-    "system/shib/organizationName": "Organization",
-    "system/shib/path": "Path",
-    "system/shib/phone": "Phone",
-    "system/shib/postalAddress": "Address",
-    "system/shib/profile": "Profile",
-    "system/shib/surname": "Surname",
-    "system/shib/use": "Enable Shibboleth",
-    "system/shib/username": "Username",
     "system/site": "Catalog description",
     "system/site/name": "Catalog name",
     "system/site/name-help": "The name displayed in different places (eg. news feed).",

web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql

@@ -584,12 +584,6 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/csw/contactId', NULL, 0, 1220, 'y');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/csw/metadataPublic', 'false', 2, 1310, 'y');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/csw/transactionUpdateCreateXPath', 'true', 2, 1320, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/use', 'false', 2, 1710, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/path', '/geonetwork/srv/en/shib.user.login', 0, 1720, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/username', 'REMOTE_USER', 0, 1740, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/surname', 'Shib-Person-surname', 0, 1750, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/firstname', 'Shib-InetOrgPerson-givenName', 0, 1760, 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/shib/profile', 'Shib-EP-Entitlement', 0, 1770, 'y');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userSelfRegistration/enable', 'false', 2, 1910, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userFeedback/enable', 'true', 2, 1911, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/clickablehyperlinks/enable', 'true', 2, 2010, 'y');

web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v302/migrate-default.sql

@@ -1,6 +1,8 @@
 
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('metadata/workflow/draftWhenInGroup', '', 0, 100002, 'n');
 
+DELETE FROM Settings WHERE name LIKE 'system/shib/%';
+
 -- ALTER TABLE groups ALTER COLUMN email TYPE varchar(128);
 
 UPDATE Settings SET value='3.0.2' WHERE name='system/platform/version';

web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml

@@ -217,8 +217,6 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans
 
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/oaipmh!?.*" access="permitAll"/>
 
-                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/shib.user.login!?.*" access="permitAll"/>
-
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/admin.group.list!?.*" access="hasRole('Editor')"/>
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/admin.group.update!?.*" access="hasRole('Administrator')"/>
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/admin.group.update.labels!?.*" access="hasRole('Administrator')"/>

web/src/main/webapp/WEB-INF/config.xml

@@ -266,7 +266,6 @@
   <include>config/config-service-search.xml</include>
   <include>config/config-service-sru.xml</include>
   <include>config/config-service-oai.xml</include>
-  <include>config/config-service-shibboleth.xml</include>
   <include>config/config-service-rss.xml</include>
   <include>config/config-service-csv.xml</include>
   <include>config/config-service-dcat-rdf.xml</include>