Author: olamy
Date: Fri Nov 23 13:31:13 2012
New Revision: 1412883
URL: http://svn.apache.org/viewvc?rev=1412883&view=rev
Log:
[MRM-1714] using LDAP can be configurable with the ui
add unit test for rest services
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java?rev=1412883&r1=1412882&r2=1412883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
Fri Nov 23 13:31:13 2012
@@ -58,11 +58,13 @@ public class DefaultArchivaRuntimeConfig
try
{
archivaRuntimeConfigurationAdmin.updateArchivaRuntimeConfiguration(
archivaRuntimeConfiguration );
+ return Boolean.TRUE;
}
catch ( RepositoryAdminException e )
{
throw new ArchivaRestServiceException( e.getMessage(), e );
}
+
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1412883&r1=1412882&r2=1412883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Fri Nov 23 13:31:13 2012
@@ -23,6 +23,7 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
+import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
import org.apache.archiva.rest.api.services.BrowseService;
import org.apache.archiva.rest.api.services.CommonServices;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
@@ -222,6 +223,20 @@ public abstract class AbstractArchivaRes
return service;
}
+ protected ArchivaRuntimeConfigurationService
getArchivaRuntimeConfigurationService()
+ {
+ ArchivaRuntimeConfigurationService service = JAXRSClientFactory.create(
+ getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/",
+ ArchivaRuntimeConfigurationService.class,
Collections.singletonList( new JacksonJaxbJsonProvider() ) );
+
+ WebClient.client( service ).accept( MediaType.APPLICATION_JSON_TYPE );
+ WebClient.client( service ).type( MediaType.APPLICATION_JSON_TYPE );
+
+ WebClient.client( service ).header( "Authorization",
authorizationHeader );
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ return service;
+ }
+
protected BrowseService getBrowseService( String authzHeader, boolean
useXml )
{
BrowseService service =
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java?rev=1412883&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
Fri Nov 23 13:31:13 2012
@@ -0,0 +1,58 @@
+package org.apache.archiva.rest.services;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration;
+import org.junit.Test;
+
+/**
+ * @author Olivier Lamy
+ */
+public class ArchivaRuntimeConfigurationServiceTest
+ extends AbstractArchivaRestTest
+{
+ @Test
+ public void nonnullConfiguration()
+ throws Exception
+ {
+ ArchivaRuntimeConfiguration archivaRuntimeConfiguration =
+
getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin();
+ assertEquals( "jdo", archivaRuntimeConfiguration.getUserManagerImpl()
);
+ }
+
+ @Test
+ public void update()
+ throws Exception
+ {
+ ArchivaRuntimeConfiguration archivaRuntimeConfiguration =
+
getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin();
+ assertEquals( "jdo", archivaRuntimeConfiguration.getUserManagerImpl()
);
+
+ archivaRuntimeConfiguration.setUserManagerImpl( "foo" );
+
+
getArchivaRuntimeConfigurationService().updateArchivaRuntimeConfiguration(
archivaRuntimeConfiguration );
+
+ archivaRuntimeConfiguration =
getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin();
+ assertEquals( "foo", archivaRuntimeConfiguration.getUserManagerImpl()
);
+
+
+ }
+
+
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
