From a9036273239ad7c015c56a7439ddf3cdad4cb45e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 13 Dec 2013 04:47:24 +0000 Subject: [PATCH] fix rat and naming git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1550640 13f79535-47bb-0310-9956-ffa450edef68 --- .../beans/ArchivaRuntimeConfiguration.java | 1 + .../model/beans/FileLockConfiguration.java | 24 +++++++++++++++---- .../services/AbstractArchivaRestTest.java | 2 +- ...dbackRuntimeConfigurationServiceTest.java} | 14 +++++------ 4 files changed, 28 insertions(+), 13 deletions(-) rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/{ArchivaRuntimeConfigurationServiceTest.java => RedbackRuntimeConfigurationServiceTest.java} (86%) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java index 91b0779bc..bfce689ba 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java @@ -1,4 +1,5 @@ package org.apache.archiva.admin.model.beans; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileLockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileLockConfiguration.java index 05faee946..706fb46cc 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileLockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileLockConfiguration.java @@ -1,10 +1,24 @@ -// =================== DO NOT EDIT THIS FILE ==================== -// Generated by Modello 1.7, -// any modifications will be overwritten. -// ============================================================== - package org.apache.archiva.admin.model.beans; +/* + * 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 javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java index f0119d01e..470fe7d89 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java @@ -232,7 +232,7 @@ public abstract class AbstractArchivaRestTest return service; } - protected RedbackRuntimeConfigurationService getArchivaRuntimeConfigurationService() + protected RedbackRuntimeConfigurationService getRedbackRuntimeConfigurationService() { RedbackRuntimeConfigurationService service = JAXRSClientFactory.create( getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/", diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java similarity index 86% rename from archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java rename to archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java index 3cd0b9476..5e91723a0 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java @@ -31,7 +31,7 @@ import java.util.List; /** * @author Olivier Lamy */ -public class ArchivaRuntimeConfigurationServiceTest +public class RedbackRuntimeConfigurationServiceTest extends AbstractArchivaRestTest { @Test @@ -39,7 +39,7 @@ public class ArchivaRuntimeConfigurationServiceTest throws Exception { RedbackRuntimeConfiguration redbackRuntimeConfiguration = - getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration(); + getRedbackRuntimeConfigurationService().getRedbackRuntimeConfiguration(); assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } @@ -48,14 +48,14 @@ public class ArchivaRuntimeConfigurationServiceTest throws Exception { RedbackRuntimeConfiguration redbackRuntimeConfiguration = - getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration(); + getRedbackRuntimeConfigurationService().getRedbackRuntimeConfiguration(); assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) ); - getArchivaRuntimeConfigurationService().updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration ); + getRedbackRuntimeConfigurationService().updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration ); - redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration(); + redbackRuntimeConfiguration = getRedbackRuntimeConfigurationService().getRedbackRuntimeConfiguration(); assertEquals( "foo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } @@ -65,7 +65,7 @@ public class ArchivaRuntimeConfigurationServiceTest public void usermanagersinformations() throws Exception { - RedbackRuntimeConfigurationService service = getArchivaRuntimeConfigurationService(); + RedbackRuntimeConfigurationService service = getRedbackRuntimeConfigurationService(); List infos = service.getUserManagerImplementationInformations(); Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains( new UserManagerImplementationInformation( "jdo", null, false ) ); @@ -76,7 +76,7 @@ public class ArchivaRuntimeConfigurationServiceTest public void rbacmanagersinformations() throws Exception { - RedbackRuntimeConfigurationService service = getArchivaRuntimeConfigurationService(); + RedbackRuntimeConfigurationService service = getRedbackRuntimeConfigurationService(); List infos = service.getRbacManagerImplementationInformations(); Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains( new RBACManagerImplementationInformation( "jdo", null, false ) );