Merge remote-tracking branch 'origin/maven/fixes/9.0' into maven/rele…

…ase/9.0
edu-sharing · Aug 22, 2024 · 8deb873 · 8deb873
2 parents 2639d89 + 621e47d
commit 8deb873
Show file tree

Hide file tree

Showing 12 changed files with 507 additions and 423 deletions.
diff --git a/Backend/alfresco/module/src/main/amp/config/alfresco/extension/model/ccContentModel.xml b/Backend/alfresco/module/src/main/amp/config/alfresco/extension/model/ccContentModel.xml
@@ -199,7 +199,8 @@
                <index enabled="true">
 		           <atomic>true</atomic>
 		           <stored>false</stored>
-		           <tokenised>both</tokenised>
+                   <!-- https://hub.alfresco.com/t5/alfresco-content-services-forum/how-to-perform-fts-exact-exact-phrase-searches-in-alfresco-6/td-p/176334 -->
+		           <tokenised>false</tokenised>
 		       </index>
             </property>
             <property name="cm:organizationId">

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/admin/v1/AdminApi.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/admin/v1/AdminApi.java
@@ -102,13 +102,14 @@ public Response refreshAppInfo(@Context HttpServletRequest req) {
 		}
 	}
 
+
 	@GET
 	@Path("/version")
 
 	@Operation(summary = "get detailed version information", description="detailed information about the running system version")
 
 	@ApiResponses(value = {
-			@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = RepositoryVersionInfo.class))),
+			@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Map.class))),
 			@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
 			@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
 			@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
@@ -117,7 +118,7 @@ public Response refreshAppInfo(@Context HttpServletRequest req) {
 	})
 	public Response getVersion(@Context HttpServletRequest req){
 		try {
-			RepositoryVersionInfo result = AdminServiceFactory.getInstance().getVersion();
+			Map<String, RepositoryVersionInfo> result = AdminServiceFactory.getInstance().getVersions();
 			return Response.ok().entity(result).build();
 		} catch (Throwable t) {
 			return ErrorResponse.createResponse(t);

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/admin/AdminService.java b/Backend/services/core/src/main/java/org/edu_sharing/service/admin/AdminService.java
@@ -130,5 +130,5 @@ void setToolpermissions(String authority,
 
 	Collection<PluginStatus> getPlugins();
 
-    RepositoryVersionInfo getVersion();
+    Map<String, RepositoryVersionInfo> getVersions();
 }
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/admin/AdminServiceImpl.java b/Backend/services/core/src/main/java/org/edu_sharing/service/admin/AdminServiceImpl.java
@@ -1,24 +1,7 @@
 package org.edu_sharing.service.admin;
 
-import java.io.*;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.text.Collator;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
+import com.google.common.io.Files;
 import jakarta.servlet.http.HttpSession;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.ServiceRegistry;
@@ -32,21 +15,24 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.AbstractConfiguration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.edu_sharing.alfrescocontext.gate.AlfAppContextGate;
 import org.edu_sharing.alfresco.lightbend.LightbendConfigLoader;
+import org.edu_sharing.alfresco.repository.server.authentication.Context;
+import org.edu_sharing.alfrescocontext.gate.AlfAppContextGate;
 import org.edu_sharing.repository.client.exception.CCException;
 import org.edu_sharing.repository.client.rpc.ACE;
 import org.edu_sharing.repository.client.rpc.ACL;
 import org.edu_sharing.repository.client.rpc.cache.CacheCluster;
 import org.edu_sharing.repository.client.rpc.cache.CacheInfo;
 import org.edu_sharing.repository.client.tools.CCConstants;
 import org.edu_sharing.repository.client.tools.StringTool;
-import org.edu_sharing.repository.server.*;
-import org.edu_sharing.alfresco.repository.server.authentication.Context;
+import org.edu_sharing.repository.server.AuthenticationToolAPI;
+import org.edu_sharing.repository.server.MCAlfrescoAPIClient;
+import org.edu_sharing.repository.server.MCAlfrescoBaseClient;
+import org.edu_sharing.repository.server.RepoFactory;
 import org.edu_sharing.repository.server.importer.ExcelLOMImporter;
 import org.edu_sharing.repository.server.importer.collections.CollectionImporter;
 import org.edu_sharing.repository.server.jobs.quartz.*;
@@ -58,13 +44,13 @@
 import org.edu_sharing.repository.server.update.PrintWriterLogAppender;
 import org.edu_sharing.repository.server.update.UpdaterService;
 import org.edu_sharing.repository.tomcat.ClassHelper;
-import org.edu_sharing.repository.update.*;
+import org.edu_sharing.repository.tools.URLHelper;
+import org.edu_sharing.repository.update.Protocol;
 import org.edu_sharing.restservices.GroupDao;
 import org.edu_sharing.restservices.RepositoryDao;
 import org.edu_sharing.restservices.admin.v1.model.PluginStatus;
 import org.edu_sharing.restservices.shared.Group;
 import org.edu_sharing.service.admin.model.GlobalGroup;
-import org.edu_sharing.repository.server.jobs.quartz.JobInfo;
 import org.edu_sharing.service.admin.model.RepositoryConfig;
 import org.edu_sharing.service.admin.model.ServerUpdateInfo;
 import org.edu_sharing.service.admin.model.ToolPermission;
@@ -86,9 +72,22 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.google.common.io.Files;
-
-import org.edu_sharing.repository.tools.URLHelper;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.text.Collator;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class AdminServiceImpl implements AdminService {
 
@@ -1138,7 +1137,7 @@ public Collection<PluginStatus> getPlugins() {
     }
 
     @Override
-    public RepositoryVersionInfo getVersion() {
+    public Map<String, RepositoryVersionInfo> getVersions() {
         try {
             return VersionService.getRepositoryVersionInfo();
         } catch (IOException e) {

diff --git a/...nd/services/core/src/main/java/org/edu_sharing/service/version/RepositoryVersionInfo.java b/...nd/services/core/src/main/java/org/edu_sharing/service/version/RepositoryVersionInfo.java
@@ -1,12 +1,11 @@
 package org.edu_sharing.service.version;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 public class RepositoryVersionInfo implements Serializable {
+    public String repository;
     public Version version;
-    public VersionMaven maven;
+//    public VersionMaven maven;
     public VersionGit git;
 
     public VersionBuild build;
@@ -36,15 +35,15 @@ public static class VersionTimestamp implements Serializable {
         public String datetime;
     }
 
-
-    public static class VersionMaven implements Serializable {
-        public HashMap<String, String> bom;
-        public VersionProject project;
-
-        public static class VersionProject implements Serializable {
-            public String artifactId;
-            public String groupId;
-            public String version;
-        }
-    }
-}
+//
+//    public static class VersionMaven implements Serializable {
+//        public HashMap<String, String> bom;
+//        public VersionProject project;
+//
+//        public static class VersionProject implements Serializable {
+//            public String artifactId;
+//            public String groupId;
+//            public String version;
+//        }
+//    }
+}