fix rat and naming

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1550640 13f79535-47bb-0310-9956-ffa450edef68

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

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;
 

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/",

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<UserManagerImplementationInformation> 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<RBACManagerImplementationInformation> infos = service.getRbacManagerImplementationInformations();
         Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
             new RBACManagerImplementationInformation( "jdo", null, false ) );