From b034cff6b53b129ef9ac1cd474e0f8698315de59 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Fri, 24 Jan 2020 21:52:07 +0100
Subject: [PATCH] Adapting configuration to redback changes

---
 .../resources/META-INF/spring-context.xml     | 24 +++++--------------
 .../services/RepositoriesServiceTest.java     |  7 +++++-
 .../src/test/resources/log4j2-test.xml        | 14 +++++++----
 .../resources/META-INF/spring-context.xml     | 13 ++++------
 .../apache/archiva/i18n/default.properties    |  1 +
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index a92327309..3373b12dc 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -37,26 +37,22 @@
 
   <context:annotation-config/>
   <context:component-scan
-      base-package="org.apache.archiva.rest.services"/>
+      base-package="org.apache.archiva.rest.services,org.apache.archiva.redback.rest.services"/>
 
-  <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
-    <property name="mapper" ref="redbackJacksonMapper"/>
-  </bean>
-
-  <bean id="redbackJacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper">
-  </bean>
 
-  <jaxrs:server id="archivaServices" address="/archivaServices">
+  <jaxrs:server id="archivaServices" address="/archivaServices" >
 
     <jaxrs:providers>
-      <ref bean="jsonProvider"/>
+      <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider"/>
       <ref bean="authenticationInterceptor#rest"/>
       <ref bean="permissionInterceptor#rest"/>
       <ref bean="requestValidationInterceptor#rest" />
       <ref bean="archivaRestServiceExceptionMapper"/>
+      <ref bean="threadLocalUserCleaner#rest" />
     </jaxrs:providers>
 
     <jaxrs:serviceBeans>
+      <ref bean="browseService#rest"/>
       <ref bean="pingService#rest"/>
       <ref bean="repositoriesService#rest"/>
       <ref bean="managedRepositoriesService#rest"/>
@@ -67,7 +63,6 @@
       <ref bean="archivaAdministrationService#default"/>
       <ref bean="searchService#rest"/>
       <ref bean="commonServices#rest"/>
-      <ref bean="browseService#rest"/>
       <ref bean="pluginsService#rest"/>
       <ref bean="systemStatusService#rest"/>
       <ref bean="reportRepositoriesService#rest" />
@@ -77,13 +72,6 @@
       <ref bean="redbackRuntimeConfigurationService#rest"/>
     </jaxrs:serviceBeans>
 
-    <jaxrs:outInterceptors>
-      <ref bean="threadLocalUserCleaner#rest"/>
-    </jaxrs:outInterceptors>
-
-    <jaxrs:outFaultInterceptors>
-
-    </jaxrs:outFaultInterceptors>
   </jaxrs:server>
 
   <bean name="browse#versionMetadata" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
@@ -97,4 +85,4 @@
     <property name="timeToLiveSeconds" value="600"/>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
index 482e26d6d..99a868822 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
@@ -21,6 +21,8 @@ package org.apache.archiva.rest.services;
 
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.maven2.model.Artifact;
+import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
+import org.apache.archiva.redback.rest.api.services.UserService;
 import org.apache.archiva.rest.api.model.BrowseResult;
 import org.apache.archiva.rest.api.model.BrowseResultEntry;
 import org.apache.archiva.rest.api.model.VersionsList;
@@ -402,11 +404,14 @@ public class RepositoriesServiceTest
     public void notAuthorizedToDeleteArtifacts()
         throws Exception
     {
+        UserService userService = getUserService( getAdminAuthzHeader() );
+        userService.createGuestUser( );
+
         ManagedRepository managedRepository = getTestManagedRepository( "SOURCE_REPO_ID", "SOURCE_REPO_ID" );
         try
         {
             getManagedRepositoriesService( authorizationHeader ).addManagedRepository( managedRepository );
-            RepositoriesService repositoriesService = getRepositoriesService( guestAuthzHeader );
+            RepositoriesService repositoriesService = getRepositoriesService(  );
             assertFalse( repositoriesService.isAuthorizedToDeleteArtifacts( managedRepository.getId() ) );
         }
         finally
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
index 9e1508240..11a7b9022 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
@@ -22,7 +22,7 @@
 <configuration> <!-- status="debug" -->
   <appenders>
     <Console name="console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{3} - %msg%n}" />
+      <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%L] [%t] %-5level %logger{6} - %msg%n}" />
     </Console>
     <RollingRandomAccessFile name="rolling" fileName="/tmp/archiva.log"
                              filePattern="/tmp/archiva-%d{yyyyMMdd}.log"
@@ -38,12 +38,18 @@
 
   <loggers>
 
-    <logger name="org.apache.archiva.redback.rest.services" level="error"/>
+    <logger name="jaxrs" level="info" />
+    <logger name="org.apache.cxf" level="info" />
+    <logger name="org.apache.archiva" level="debug" />
+    <logger name="org.apache.archiva.redback" level="debug"/>
+    <logger name="com.fasterxml.jackson" level="info" />
+    <logger name="org.apache.archiva.components.registry.commons" level="error" />
+
     <logger name="JPOX" level="error"/>
     <logger name="org.apache.archiva.rest.services" level="info"/>
-    <logger name="org.springframework" level="info"/>
+    <logger name="org.springframework" level="error"/>
     <logger name="org.apache.commons.configuration" level="info"/>
-    <logger name="org.apache.archiva.metadata.repository.storage.maven2" level="DEBUG" />
+    <logger name="org.apache.archiva.metadata.repository.storage.maven2" level="error" />
 
     <root level="info">
       <appender-ref ref="console"/>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml
index 1a981c78c..168363607 100755
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml
@@ -34,10 +34,11 @@
        default-lazy-init="true">
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.archiva.redback.keys,org.apache.archiva.web.startup, org.apache.archiva.web.runtime, org.apache.archiva.web.api,, org.apache.archiva.web.security"/>
+  <context:component-scan base-package="org.apache.archiva.redback.keys,org.apache.archiva.web.startup,org.apache.archiva.web.runtime,org.apache.archiva.web.api,org.apache.archiva.web.security,org.apache.archiva.redback.rest,org.apache.archiva.rest.services.interceptors"/>
 
   <util:properties id="archivaRuntimeProperties" location="classpath:application.properties" />
 
+
   <jaxrs:server id="archivaUiServices" address="/archivaUiServices">
 
     <jaxrs:providers>
@@ -45,6 +46,7 @@
       <ref bean="authenticationInterceptor#rest"/>
       <ref bean="permissionInterceptor#rest"/>
       <ref bean="archivaRestServiceExceptionMapper"/>
+      <ref bean="threadLocalUserCleaner#rest" />
     </jaxrs:providers>
 
     <jaxrs:serviceBeans>
@@ -54,13 +56,6 @@
       <ref bean="javascriptLogger#default"/>
     </jaxrs:serviceBeans>
 
-    <jaxrs:outInterceptors>
-      <ref bean="threadLocalUserCleaner#rest"/>
-    </jaxrs:outInterceptors>
-
-    <jaxrs:outFaultInterceptors>
-
-    </jaxrs:outFaultInterceptors>
   </jaxrs:server>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index a2c8e0c38..d22872b31 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -682,6 +682,7 @@ redback.runtime.users.cache.title=Users Cache
 
 ldap.config.dn.help.content=The name of the attribute containing the DN
 ldap.config.user.attribute.help.content=The name of the RDN attribute in the DN of the user object containing the User-ID (e.g. for cn=usr1,ou=users,ou=tst,ou=org, the value would be cn)
+ldap.config.groups.name.attribute.help.content=The name of the attribute of a group object that contains the name of the group.
 redback.default.role.guest.id.help.content=The User-ID of the guest user
 rest.baseUrl.help.content=URL that is used as base url for validating REST requests. If empty, the URL ist determined automatically.
 rest.csrffilter.absentorigin.deny.help.content=If true and no Origin/Referer header can be found on REST requests, the requests will be denied. Default: true.
-- 
2.39.5