Feature #13961: wiring new Silverpeas-Kernel project.

Author: SilverYoCha

pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.silverpeas</groupId>
     <artifactId>silverpeas-project</artifactId>
-    <version>1.6-build230623</version>
+    <version>1.6-build240209</version>
   </parent>
 
   <artifactId>wbe</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Silverpeas Web Browser Edition</name>
 
@@ -46,7 +46,7 @@
     <!-- property used by the CI to both deploy a build version and release the next stable version -->
     <next.release>1.0</next.release>
     <!-- Version of Silverpeas on which it depends -->
-    <silverpeas.version>6.4-build230920</silverpeas.version>
+    <silverpeas.version>6.4-SNAPSHOT</silverpeas.version>
   </properties>
 
   <dependencies>

wopi/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.silverpeas</groupId>
     <artifactId>wbe</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.silverpeas.wbe</groupId>

wopi/wopi-configuration/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.silverpeas.wbe</groupId>
     <artifactId>wopi</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.silverpeas.wbe.wopi</groupId>

wopi/wopi-war/pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.silverpeas.wbe</groupId>
     <artifactId>wopi</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.silverpeas.wbe.wopi</groupId>

wopi/wopi-war/src/main/java/org/silverpeas/wbe/wopi/WopiClientManager.java

@@ -51,8 +51,8 @@
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.silverpeas.core.util.HttpUtil.httpClientTrustingAnySslContext;
 import static org.silverpeas.core.util.HttpUtil.toUrl;
-import static org.silverpeas.core.util.StringUtil.isDefined;
 import static org.silverpeas.core.wbe.WbeLogger.logger;
+import static org.silverpeas.kernel.util.StringUtil.isDefined;
 import static org.silverpeas.wbe.wopi.util.WopiSettings.*;
 
 /**

wopi/wopi-war/src/main/java/org/silverpeas/wbe/wopi/WopiFileResource.java

@@ -27,14 +27,14 @@
 import org.silverpeas.core.admin.user.model.User;
 import org.silverpeas.core.annotation.WebService;
 import org.silverpeas.core.util.JSONCodec;
-import org.silverpeas.core.util.StringUtil;
 import org.silverpeas.core.wbe.WbeFile;
 import org.silverpeas.core.wbe.WbeUser;
 import org.silverpeas.core.web.rs.annotation.Authenticated;
 import org.silverpeas.core.webapi.wbe.AbstractWbeFileResource;
 import org.silverpeas.core.webapi.wbe.WbeFileEditionContext;
 import org.silverpeas.core.webapi.wbe.WbeFileWrapper;
 import org.silverpeas.core.webapi.wbe.WbeResponseError;
+import org.silverpeas.kernel.util.StringUtil;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -58,12 +58,12 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
 import static javax.ws.rs.core.Response.Status.CONFLICT;
 import static org.silverpeas.core.date.TemporalFormatter.toIso8601;
-import static org.silverpeas.core.util.StringUtil.*;
 import static org.silverpeas.core.util.URLUtil.getFullApplicationURL;
 import static org.silverpeas.core.util.URLUtil.getServerURL;
 import static org.silverpeas.core.util.file.FileServerUtils.getImageURL;
 import static org.silverpeas.core.wbe.WbeLogger.logger;
 import static org.silverpeas.core.wbe.WbeSettings.getWbeUserIdPrefix;
+import static org.silverpeas.kernel.util.StringUtil.*;
 import static org.silverpeas.wbe.wopi.util.WopiSettings.*;
 
 /**

wopi/wopi-war/src/main/java/org/silverpeas/wbe/wopi/WopiLockResponseManager.java

@@ -34,8 +34,8 @@
 import static java.text.MessageFormat.format;
 import static javax.ws.rs.core.Response.Status.CONFLICT;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
-import static org.silverpeas.core.util.StringUtil.isDefined;
 import static org.silverpeas.core.wbe.WbeLogger.logger;
+import static org.silverpeas.kernel.util.StringUtil.isDefined;
 import static org.silverpeas.wbe.wopi.WopiFileResource.WOPI_LOCK_HEADER;
 import static org.silverpeas.wbe.wopi.util.WopiSettings.isLockCapabilityEnabled;
 

wopi/wopi-war/src/main/java/org/silverpeas/wbe/wopi/discovery/WopiDiscovery.java

@@ -24,7 +24,7 @@
 
 package org.silverpeas.wbe.wopi.discovery;
 
-import org.silverpeas.core.SilverpeasRuntimeException;
+import org.silverpeas.kernel.SilverpeasRuntimeException;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;

wopi/wopi-war/src/main/java/org/silverpeas/wbe/wopi/util/WopiSettings.java

@@ -24,19 +24,19 @@
 
 package org.silverpeas.wbe.wopi.util;
 
-import org.silverpeas.core.SilverpeasRuntimeException;
-import org.silverpeas.core.util.Pair;
-import org.silverpeas.core.util.ResourceLocator;
-import org.silverpeas.core.util.SettingBundle;
-import org.silverpeas.core.util.StringUtil;
 import org.silverpeas.core.util.URLUtil;
+import org.silverpeas.kernel.SilverpeasRuntimeException;
+import org.silverpeas.kernel.bundle.ResourceLocator;
+import org.silverpeas.kernel.bundle.SettingBundle;
+import org.silverpeas.kernel.util.Pair;
+import org.silverpeas.kernel.util.StringUtil;
 
 import javax.ws.rs.core.UriBuilder;
 import java.net.URI;
 import java.util.Optional;
 
 import static java.util.Optional.ofNullable;
-import static org.silverpeas.core.util.StringUtil.isDefined;
+import static org.silverpeas.kernel.util.StringUtil.isDefined;
 
 /**
  * @author silveryocha

wopi/wopi-war/src/main/webapp/wbe/wopi/editor.jsp

@@ -22,7 +22,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   --%>
 <%@ page import="org.silverpeas.core.admin.user.model.User" %>
-<%@ page import="org.silverpeas.core.util.StringUtil" %>
+<%@ page import="org.silverpeas.kernel.util.StringUtil" %>
 <%@ page import="org.silverpeas.wbe.wopi.util.WopiSettings" %>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %>