Skip to content

Commit 5ad0f0b

Browse files
committed
Feature #13961
Take into account the changes in Silverpeas-Core: some codes are now provided directly by Silverpeas Kernel. The codes are: - annotations - exceptions - utility classes - cache API - logging API - bundle API
1 parent 4039932 commit 5ad0f0b

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraNews.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.silverpeas.core.contribution.model.Thumbnail;
55
import org.silverpeas.core.pdc.pdc.model.ClassifyPosition;
66
import org.silverpeas.core.pdc.pdc.model.ClassifyValue;
7-
import org.silverpeas.core.util.logging.SilverLogger;
7+
import org.silverpeas.kernel.logging.SilverLogger;
88
import org.silverpeas.core.web.look.Shortcut;
99

1010
import java.util.Date;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/AuroraSpaceHomePage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
import org.silverpeas.core.contribution.template.publication.PublicationTemplate;
4545
import org.silverpeas.core.contribution.template.publication.PublicationTemplateManager;
4646
import org.silverpeas.core.util.CollectionUtil;
47-
import org.silverpeas.core.util.Pair;
48-
import org.silverpeas.core.util.StringUtil;
47+
import org.silverpeas.kernel.util.Pair;
48+
import org.silverpeas.kernel.util.StringUtil;
4949
import org.silverpeas.core.util.URLUtil;
50-
import org.silverpeas.core.util.logging.SilverLogger;
50+
import org.silverpeas.kernel.logging.SilverLogger;
5151
import org.silverpeas.core.web.look.Shortcut;
5252

5353
import java.util.ArrayList;
@@ -61,7 +61,7 @@
6161
import static java.util.Collections.emptyList;
6262
import static java.util.Optional.ofNullable;
6363
import static java.util.stream.Collectors.toMap;
64-
import static org.silverpeas.core.util.StringUtil.EMPTY;
64+
import static org.silverpeas.kernel.util.StringUtil.EMPTY;
6565
import static org.silverpeas.looks.aurora.AuroraSpaceHomePageZone.MAIN;
6666
import static org.silverpeas.looks.aurora.AuroraSpaceHomePageZone.RIGHT;
6767

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/ListOfContributions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.silverpeas.core.admin.component.model.SilverpeasComponentInstance;
44
import org.silverpeas.core.admin.service.OrganizationController;
5-
import org.silverpeas.core.util.Mutable;
6-
import org.silverpeas.core.util.StringUtil;
5+
import org.silverpeas.kernel.util.Mutable;
6+
import org.silverpeas.kernel.util.StringUtil;
77
import org.silverpeas.core.util.URLUtil;
88
import org.silverpeas.core.web.look.Shortcut;
99

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.silverpeas.components.rssaggregator.model.SPChannel;
1717
import org.silverpeas.components.rssaggregator.service.RSSService;
1818
import org.silverpeas.components.rssaggregator.service.RSSServiceProvider;
19-
import org.silverpeas.core.SilverpeasRuntimeException;
19+
import org.silverpeas.kernel.SilverpeasRuntimeException;
2020
import org.silverpeas.core.admin.component.model.ComponentInst;
2121
import org.silverpeas.core.admin.component.model.ComponentInstLight;
2222
import org.silverpeas.core.admin.component.model.PersonalComponent;
@@ -48,11 +48,11 @@
4848
import org.silverpeas.core.util.ArrayUtil;
4949
import org.silverpeas.core.util.CollectionUtil;
5050
import org.silverpeas.core.util.DateUtil;
51-
import org.silverpeas.core.util.LocalizationBundle;
52-
import org.silverpeas.core.util.ResourceLocator;
53-
import org.silverpeas.core.util.StringUtil;
51+
import org.silverpeas.kernel.bundle.LocalizationBundle;
52+
import org.silverpeas.kernel.bundle.ResourceLocator;
53+
import org.silverpeas.kernel.util.StringUtil;
5454
import org.silverpeas.core.util.URLUtil;
55-
import org.silverpeas.core.util.logging.SilverLogger;
55+
import org.silverpeas.kernel.logging.SilverLogger;
5656
import org.silverpeas.core.web.look.DefaultLayoutConfiguration;
5757
import org.silverpeas.core.web.look.LookHelper;
5858
import org.silverpeas.core.web.look.LookSilverpeasV5Helper;
@@ -84,8 +84,8 @@
8484
import static java.util.stream.Stream.of;
8585
import static org.silverpeas.core.admin.space.SpaceInst.SPACE_KEY_PREFIX;
8686
import static org.silverpeas.core.admin.user.constant.UserState.*;
87-
import static org.silverpeas.core.util.StringUtil.EMPTY;
88-
import static org.silverpeas.core.util.StringUtil.split;
87+
import static org.silverpeas.kernel.util.StringUtil.EMPTY;
88+
import static org.silverpeas.kernel.util.StringUtil.split;
8989
import static org.silverpeas.looks.aurora.AuroraSpaceHomePage.TEMPLATE_NAME;
9090

9191
@SuppressWarnings("unused")

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.silverpeas.looks.aurora;
22

33
import org.silverpeas.core.admin.user.model.User;
4-
import org.silverpeas.core.util.SettingBundle;
4+
import org.silverpeas.kernel.bundle.SettingBundle;
55
import org.silverpeas.core.util.URLUtil;
66

77
import static java.util.Optional.ofNullable;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/NewsList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.silverpeas.core.pdc.pdc.model.ClassifyPosition;
55
import org.silverpeas.core.pdc.pdc.model.ClassifyValue;
66
import org.silverpeas.core.pdc.pdc.model.Value;
7-
import org.silverpeas.core.util.logging.SilverLogger;
7+
import org.silverpeas.kernel.logging.SilverLogger;
88
import org.silverpeas.core.web.look.Shortcut;
99

1010
import java.util.ArrayList;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/service/weather/OpenWeatherMapRequester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.silverpeas.core.admin.user.model.User;
44
import org.silverpeas.core.annotation.Service;
5-
import org.silverpeas.core.util.logging.SilverLogger;
5+
import org.silverpeas.kernel.logging.SilverLogger;
66

77
import javax.enterprise.inject.Default;
88
import javax.inject.Named;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/service/weather/WeatherCache.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.silverpeas.looks.aurora.service.weather;
22

33
import org.silverpeas.core.annotation.Bean;
4-
import org.silverpeas.core.annotation.Technical;
5-
import org.silverpeas.core.cache.model.Cache;
4+
import org.silverpeas.kernel.annotation.Technical;
5+
import org.silverpeas.kernel.cache.model.Cache;
66
import org.silverpeas.core.cache.service.CacheAccessorProvider;
7-
import org.silverpeas.core.util.ResourceLocator;
7+
import org.silverpeas.kernel.bundle.ResourceLocator;
88

99
import javax.inject.Singleton;
1010
import java.util.function.Supplier;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/service/weather/WeatherSettings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.silverpeas.looks.aurora.service.weather;
22

3-
import org.silverpeas.core.util.ResourceLocator;
3+
import org.silverpeas.kernel.bundle.ResourceLocator;
44
import org.silverpeas.core.util.ServiceProvider;
5-
import org.silverpeas.core.util.SettingBundle;
6-
import org.silverpeas.core.util.StringUtil;
7-
import org.silverpeas.core.util.logging.SilverLogger;
5+
import org.silverpeas.kernel.bundle.SettingBundle;
6+
import org.silverpeas.kernel.util.StringUtil;
7+
import org.silverpeas.kernel.logging.SilverLogger;
88

99
import javax.enterprise.context.SessionScoped;
1010
import java.io.Serializable;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/service/weather/YahooWeatherRequester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.silverpeas.looks.aurora.service.weather;
22

33
import org.silverpeas.core.annotation.Service;
4-
import org.silverpeas.core.util.logging.SilverLogger;
4+
import org.silverpeas.kernel.logging.SilverLogger;
55

66
import javax.crypto.Mac;
77
import javax.crypto.spec.SecretKeySpec;

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/servlets/GoToSpaceHomepageBackOffice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import org.silverpeas.core.admin.component.model.Parameter;
66
import org.silverpeas.core.admin.component.model.WAComponent;
77
import org.silverpeas.core.admin.service.Administration;
8-
import org.silverpeas.core.util.StringUtil;
8+
import org.silverpeas.kernel.util.StringUtil;
99
import org.silverpeas.core.util.URLUtil;
10-
import org.silverpeas.core.util.logging.SilverLogger;
10+
import org.silverpeas.kernel.logging.SilverLogger;
1111
import org.silverpeas.core.web.http.HttpRequest;
1212
import org.silverpeas.core.web.look.LookHelper;
1313
import org.silverpeas.looks.aurora.AuroraSpaceHomePage;

aurora/aurora-war/src/main/webapp/look/jsp/DomainsBar.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.GraphicElementFactory" %>
3030
<%@ page import="org.silverpeas.core.web.look.LookHelper" %>
31-
<%@ page import="org.silverpeas.core.util.StringUtil" %>
31+
<%@ page import="org.silverpeas.kernel.util.StringUtil" %>
3232
<%@ page import="org.silverpeas.core.util.URLUtil" %>
3333
<%@ page import="org.owasp.encoder.Encode" %>
3434

aurora/aurora-war/src/main/webapp/look/jsp/MainFrame.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%@page import="org.silverpeas.looks.aurora.LookAuroraHelper"%>
2-
<%@ page import="org.silverpeas.core.util.StringUtil" %>
3-
<%@ page import="org.silverpeas.core.util.ResourceLocator" %>
4-
<%@ page import="org.silverpeas.core.util.LocalizationBundle" %>
2+
<%@ page import="org.silverpeas.kernel.util.StringUtil" %>
3+
<%@ page import="org.silverpeas.kernel.bundle.ResourceLocator" %>
4+
<%@ page import="org.silverpeas.kernel.bundle.LocalizationBundle" %>
55
<%@ page import="org.silverpeas.core.web.look.LookHelper" %>
66
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
77
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>

0 commit comments

Comments
 (0)