git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539901 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-2.0.0-RC1
@@ -34,14 +34,14 @@ | |||
default-lazy-init="true"> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.web.spring, 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.web.startup, org.apache.archiva.web.runtime, org.apache.archiva.web.api,, org.apache.archiva.web.security"/> | |||
<util:properties id="archivaRuntimeProperties" location="classpath:application.properties" /> | |||
<jaxrs:server id="archivaUiServices" address="/archivaUiServices"> | |||
<jaxrs:providers> | |||
<bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/> | |||
<bean class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider"/> | |||
<ref bean="authenticationInterceptor#rest"/> | |||
<ref bean="permissionInterceptor#rest"/> | |||
<ref bean="archivaRestServiceExceptionMapper"/> |
@@ -18,6 +18,7 @@ package org.apache.archiva; | |||
* under the License. | |||
*/ | |||
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.rest.api.services.ManagedRepositoriesService; | |||
import org.apache.archiva.rest.api.services.ProxyConnectorService; | |||
@@ -31,7 +32,6 @@ import org.apache.cxf.common.util.Base64Utility; | |||
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; | |||
import org.apache.cxf.jaxrs.client.WebClient; | |||
import org.apache.cxf.transport.servlet.CXFServlet; | |||
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; | |||
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; | |||
import org.apache.archiva.redback.rest.api.model.User; | |||
import org.apache.archiva.redback.rest.api.services.RoleManagementService; |
@@ -18,12 +18,12 @@ package org.apache.archiva; | |||
* under the License. | |||
*/ | |||
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; | |||
import org.apache.archiva.web.api.RuntimeInfoService; | |||
import org.apache.archiva.web.model.ApplicationRuntimeInfo; | |||
import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; | |||
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; | |||
import org.apache.archiva.redback.rest.services.AbstractRestServicesTest; | |||
import org.junit.Before; | |||
import org.junit.Test; |