From: Olivier Lamy Date: Tue, 18 Dec 2012 21:18:56 +0000 (+0000) Subject: use a better naming convention as it concerned redback part X-Git-Tag: archiva-1.4-M4~468 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9736ffc636b14f9a81c886a8589486b5b667365b;p=archiva.git use a better naming convention as it concerned redback part git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1423659 13f79535-47bb-0310-9956-ffa450edef68 --- 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 deleted file mode 100644 index bb938a6f3..000000000 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java +++ /dev/null @@ -1,139 +0,0 @@ -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; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Olivier Lamy - * @since 1.4-M4 - */ -@XmlRootElement(name = "redbackRuntimeConfiguration") -public class ArchivaRuntimeConfiguration - implements Serializable -{ - - /** - * Field userManagerImpls. - */ - private List userManagerImpls = new ArrayList(); - - private LdapConfiguration ldapConfiguration; - - /** - * flag to know if redback configuration has been checked/migrated. - */ - private boolean migratedFromRedbackConfiguration = false; - - private Map configurationProperties; - - /** - * field to ease json mapping wrapper on configurationProperties field - */ - private List configurationPropertiesEntries; - - public ArchivaRuntimeConfiguration() - { - // no op - } - - public List getUserManagerImpls() - { - return userManagerImpls; - } - - public void setUserManagerImpls( List userManagerImpls ) - { - this.userManagerImpls = userManagerImpls; - } - - public LdapConfiguration getLdapConfiguration() - { - return ldapConfiguration; - } - - public void setLdapConfiguration( LdapConfiguration ldapConfiguration ) - { - this.ldapConfiguration = ldapConfiguration; - } - - public boolean isMigratedFromRedbackConfiguration() - { - return migratedFromRedbackConfiguration; - } - - public void setMigratedFromRedbackConfiguration( boolean migratedFromRedbackConfiguration ) - { - this.migratedFromRedbackConfiguration = migratedFromRedbackConfiguration; - } - - public Map getConfigurationProperties() - { - if ( this.configurationProperties == null ) - { - this.configurationProperties = new HashMap(); - } - return configurationProperties; - } - - public void setConfigurationProperties( Map configurationProperties ) - { - this.configurationProperties = configurationProperties; - } - - public List getConfigurationPropertiesEntries() - { - configurationPropertiesEntries = new ArrayList( getConfigurationProperties().size() ); - for ( Map.Entry entry : getConfigurationProperties().entrySet() ) - { - configurationPropertiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) ); - } - return configurationPropertiesEntries; - } - - public void setConfigurationPropertiesEntries( List configurationPropertiesEntries ) - { - this.configurationPropertiesEntries = configurationPropertiesEntries; - if ( configurationPropertiesEntries != null ) - { - this.configurationProperties = new HashMap( configurationPropertiesEntries.size() ); - for ( PropertyEntry propertyEntry : configurationPropertiesEntries ) - { - this.configurationProperties.put( propertyEntry.getKey(), propertyEntry.getValue() ); - } - } - } - - @Override - public String toString() - { - return "ArchivaRuntimeConfiguration{" + - "userManagerImpls=" + userManagerImpls + - ", ldapConfiguration=" + ldapConfiguration + - ", migratedFromRedbackConfiguration=" + migratedFromRedbackConfiguration + - ", configurationProperties=" + configurationProperties + - ", configurationPropertiesEntries=" + configurationPropertiesEntries + - '}'; - } -} diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java new file mode 100644 index 000000000..882645e69 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java @@ -0,0 +1,139 @@ +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; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Olivier Lamy + * @since 1.4-M4 + */ +@XmlRootElement(name = "redbackRuntimeConfiguration") +public class RedbackRuntimeConfiguration + implements Serializable +{ + + /** + * Field userManagerImpls. + */ + private List userManagerImpls = new ArrayList(); + + private LdapConfiguration ldapConfiguration; + + /** + * flag to know if redback configuration has been checked/migrated. + */ + private boolean migratedFromRedbackConfiguration = false; + + private Map configurationProperties; + + /** + * field to ease json mapping wrapper on configurationProperties field + */ + private List configurationPropertiesEntries; + + public RedbackRuntimeConfiguration() + { + // no op + } + + public List getUserManagerImpls() + { + return userManagerImpls; + } + + public void setUserManagerImpls( List userManagerImpls ) + { + this.userManagerImpls = userManagerImpls; + } + + public LdapConfiguration getLdapConfiguration() + { + return ldapConfiguration; + } + + public void setLdapConfiguration( LdapConfiguration ldapConfiguration ) + { + this.ldapConfiguration = ldapConfiguration; + } + + public boolean isMigratedFromRedbackConfiguration() + { + return migratedFromRedbackConfiguration; + } + + public void setMigratedFromRedbackConfiguration( boolean migratedFromRedbackConfiguration ) + { + this.migratedFromRedbackConfiguration = migratedFromRedbackConfiguration; + } + + public Map getConfigurationProperties() + { + if ( this.configurationProperties == null ) + { + this.configurationProperties = new HashMap(); + } + return configurationProperties; + } + + public void setConfigurationProperties( Map configurationProperties ) + { + this.configurationProperties = configurationProperties; + } + + public List getConfigurationPropertiesEntries() + { + configurationPropertiesEntries = new ArrayList( getConfigurationProperties().size() ); + for ( Map.Entry entry : getConfigurationProperties().entrySet() ) + { + configurationPropertiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) ); + } + return configurationPropertiesEntries; + } + + public void setConfigurationPropertiesEntries( List configurationPropertiesEntries ) + { + this.configurationPropertiesEntries = configurationPropertiesEntries; + if ( configurationPropertiesEntries != null ) + { + this.configurationProperties = new HashMap( configurationPropertiesEntries.size() ); + for ( PropertyEntry propertyEntry : configurationPropertiesEntries ) + { + this.configurationProperties.put( propertyEntry.getKey(), propertyEntry.getValue() ); + } + } + } + + @Override + public String toString() + { + return "RedbackRuntimeConfiguration{" + + "userManagerImpls=" + userManagerImpls + + ", ldapConfiguration=" + ldapConfiguration + + ", migratedFromRedbackConfiguration=" + migratedFromRedbackConfiguration + + ", configurationProperties=" + configurationProperties + + ", configurationPropertiesEntries=" + configurationPropertiesEntries + + '}'; + } +} diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java index 9cf37ee56..116ac3065 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java @@ -19,7 +19,7 @@ package org.apache.archiva.admin.model.runtime; */ import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; +import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; /** * @author Olivier Lamy @@ -27,10 +27,10 @@ import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; */ public interface ArchivaRuntimeConfigurationAdmin { - ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration() + RedbackRuntimeConfiguration getArchivaRuntimeConfiguration() throws RepositoryAdminException; - void updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + void updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws RepositoryAdminException; } diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java index c5eef69d0..302e7bbcd 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java @@ -21,12 +21,11 @@ package org.apache.archiva.admin.repository.runtime; import net.sf.beanlib.provider.replicator.BeanReplicator; import org.apache.archiva.admin.model.RepositoryAdminException; import org.apache.archiva.admin.model.beans.LdapConfiguration; -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; +import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.IndeterminateConfigurationException; -import org.apache.archiva.configuration.RedbackRuntimeConfiguration; import org.apache.archiva.redback.components.registry.RegistryException; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationException; @@ -65,24 +64,24 @@ public class DefaultArchivaRuntimeConfigurationAdmin { try { - ArchivaRuntimeConfiguration archivaRuntimeConfiguration = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration redbackRuntimeConfiguration = getArchivaRuntimeConfiguration(); // migrate or not data from redback - if ( !archivaRuntimeConfiguration.isMigratedFromRedbackConfiguration() ) + if ( !redbackRuntimeConfiguration.isMigratedFromRedbackConfiguration() ) { // so migrate if available String userManagerImpl = userConfiguration.getString( UserConfigurationKeys.USER_MANAGER_IMPL ); if ( StringUtils.isNotEmpty( userManagerImpl ) ) { - archivaRuntimeConfiguration.getUserManagerImpls().add( userManagerImpl ); + redbackRuntimeConfiguration.getUserManagerImpls().add( userManagerImpl ); } // now ldap - LdapConfiguration ldapConfiguration = archivaRuntimeConfiguration.getLdapConfiguration(); + LdapConfiguration ldapConfiguration = redbackRuntimeConfiguration.getLdapConfiguration(); if ( ldapConfiguration == null ) { ldapConfiguration = new LdapConfiguration(); - archivaRuntimeConfiguration.setLdapConfiguration( ldapConfiguration ); + redbackRuntimeConfiguration.setLdapConfiguration( ldapConfiguration ); } ldapConfiguration.setHostName( @@ -100,19 +99,19 @@ public class DefaultArchivaRuntimeConfigurationAdmin ldapConfiguration.setAuthenticationMethod( userConfiguration.getString( UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD, null ) ); - archivaRuntimeConfiguration.setMigratedFromRedbackConfiguration( true ); + redbackRuntimeConfiguration.setMigratedFromRedbackConfiguration( true ); - updateArchivaRuntimeConfiguration( archivaRuntimeConfiguration ); + updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration ); } // we must ensure userManagerImpls list is not empty if so put at least jdo one ! - if ( archivaRuntimeConfiguration.getUserManagerImpls().isEmpty() ) + if ( redbackRuntimeConfiguration.getUserManagerImpls().isEmpty() ) { log.info( - "archivaRuntimeConfiguration with empty userManagerImpls so force at least jdo implementation !" ); - archivaRuntimeConfiguration.getUserManagerImpls().add( "jdo" ); - updateArchivaRuntimeConfiguration( archivaRuntimeConfiguration ); + "redbackRuntimeConfiguration with empty userManagerImpls so force at least jdo implementation !" ); + redbackRuntimeConfiguration.getUserManagerImpls().add( "jdo" ); + updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration ); } } @@ -122,15 +121,16 @@ public class DefaultArchivaRuntimeConfigurationAdmin } } - public ArchivaRuntimeConfiguration getArchivaRuntimeConfiguration() + public RedbackRuntimeConfiguration getArchivaRuntimeConfiguration() { return build( archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() ); } - public void updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + public void updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws RepositoryAdminException { - RedbackRuntimeConfiguration runtimeConfiguration = build( archivaRuntimeConfiguration ); + org.apache.archiva.configuration.RedbackRuntimeConfiguration + runtimeConfiguration = build( redbackRuntimeConfiguration ); Configuration configuration = archivaConfiguration.getConfiguration(); configuration.setRedbackRuntimeConfiguration( runtimeConfiguration ); try @@ -147,31 +147,31 @@ public class DefaultArchivaRuntimeConfigurationAdmin } } - private ArchivaRuntimeConfiguration build( RedbackRuntimeConfiguration runtimeConfiguration ) + private RedbackRuntimeConfiguration build( org.apache.archiva.configuration.RedbackRuntimeConfiguration runtimeConfiguration ) { - ArchivaRuntimeConfiguration archivaRuntimeConfiguration = - new BeanReplicator().replicateBean( runtimeConfiguration, ArchivaRuntimeConfiguration.class ); + RedbackRuntimeConfiguration redbackRuntimeConfiguration = + new BeanReplicator().replicateBean( runtimeConfiguration, RedbackRuntimeConfiguration.class ); if ( runtimeConfiguration.getLdapConfiguration() != null ) { - archivaRuntimeConfiguration.setLdapConfiguration( + redbackRuntimeConfiguration.setLdapConfiguration( new BeanReplicator().replicateBean( runtimeConfiguration.getLdapConfiguration(), LdapConfiguration.class ) ); } - if ( archivaRuntimeConfiguration.getLdapConfiguration() == null ) + if ( redbackRuntimeConfiguration.getLdapConfiguration() == null ) { // prevent NPE - archivaRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() ); + redbackRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() ); } - return archivaRuntimeConfiguration; + return redbackRuntimeConfiguration; } - private RedbackRuntimeConfiguration build( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + private org.apache.archiva.configuration.RedbackRuntimeConfiguration build( RedbackRuntimeConfiguration archivaRuntimeConfiguration ) { - RedbackRuntimeConfiguration redbackRuntimeConfiguration = - new BeanReplicator().replicateBean( archivaRuntimeConfiguration, RedbackRuntimeConfiguration.class ); + org.apache.archiva.configuration.RedbackRuntimeConfiguration redbackRuntimeConfiguration = + new BeanReplicator().replicateBean( archivaRuntimeConfiguration, org.apache.archiva.configuration.RedbackRuntimeConfiguration.class ); redbackRuntimeConfiguration.setLdapConfiguration( new BeanReplicator().replicateBean( archivaRuntimeConfiguration.getLdapConfiguration(), @@ -191,7 +191,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin return getArchivaRuntimeConfiguration().getUserManagerImpls().get( 0 ); } - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -211,7 +211,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -237,7 +237,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin return getArchivaRuntimeConfiguration().getLdapConfiguration().getAuthenticationMethod(); } - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -258,7 +258,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -267,7 +267,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin public int getInt( String key ) { - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -283,7 +283,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -297,7 +297,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin return getArchivaRuntimeConfiguration().getLdapConfiguration().getPort(); } - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -313,7 +313,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -322,7 +322,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin public boolean getBoolean( String key ) { - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -338,7 +338,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -352,7 +352,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin return getArchivaRuntimeConfiguration().getLdapConfiguration().isSsl(); } - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); if ( conf.getConfigurationProperties().containsKey( key ) ) { @@ -368,7 +368,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } @@ -379,7 +379,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin { List value = userConfiguration.getList( key ); - ArchivaRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); + RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration(); // TODO concat values conf.getConfigurationProperties().put( key, "" ); try @@ -388,7 +388,7 @@ public class DefaultArchivaRuntimeConfigurationAdmin } catch ( RepositoryAdminException e ) { - log.error( "fail to save ArchivaRuntimeConfiguration: {}", e.getMessage(), e ); + log.error( "fail to save RedbackRuntimeConfiguration: {}", e.getMessage(), e ); throw new RuntimeException( e.getMessage(), e ); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java index db037fa01..60e1b550b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java @@ -18,7 +18,7 @@ package org.apache.archiva.rest.api.services; * under the License. */ -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; +import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.admin.model.beans.LdapConfiguration; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.rest.api.model.UserManagerImplementationInformation; @@ -44,15 +44,15 @@ public interface ArchivaRuntimeConfigurationService @GET @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION) - ArchivaRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() + RedbackRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() throws ArchivaRestServiceException; - @Path("archivaRuntimeConfiguration") + @Path("redbackRuntimeConfiguration") @PUT @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION) - Boolean updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + Boolean updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws ArchivaRestServiceException; @Path("userManagerImplementationInformation") diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java index edff21d5a..bd4a4dd23 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java @@ -19,7 +19,7 @@ package org.apache.archiva.rest.services; */ import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; +import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.admin.model.beans.LdapConfiguration; import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin; import org.apache.archiva.redback.authentication.AuthenticationException; @@ -71,7 +71,7 @@ public class DefaultArchivaRuntimeConfigurationService @Named(value = "ldapConnectionFactory#configurable") private LdapConnectionFactory ldapConnectionFactory; - public ArchivaRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() + public RedbackRuntimeConfiguration getArchivaRuntimeConfigurationAdmin() throws ArchivaRestServiceException { try @@ -84,25 +84,25 @@ public class DefaultArchivaRuntimeConfigurationService } } - public Boolean updateArchivaRuntimeConfiguration( ArchivaRuntimeConfiguration archivaRuntimeConfiguration ) + public Boolean updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration ) throws ArchivaRestServiceException { try { // has user manager impl changed ? - boolean userManagerChanged = archivaRuntimeConfiguration.getUserManagerImpls().size() + boolean userManagerChanged = redbackRuntimeConfiguration.getUserManagerImpls().size() != archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls().size(); userManagerChanged = - userManagerChanged || ( archivaRuntimeConfiguration.getUserManagerImpls().toString().hashCode() + userManagerChanged || ( redbackRuntimeConfiguration.getUserManagerImpls().toString().hashCode() != archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls().toString().hashCode() ); - archivaRuntimeConfigurationAdmin.updateArchivaRuntimeConfiguration( archivaRuntimeConfiguration ); + archivaRuntimeConfigurationAdmin.updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration ); if ( userManagerChanged ) { log.info( "user managerImpls changed to {} so reload it", - archivaRuntimeConfiguration.getUserManagerImpls() ); + redbackRuntimeConfiguration.getUserManagerImpls() ); userManager.initialize(); } 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/ArchivaRuntimeConfigurationServiceTest.java index ed524fd5c..ce88fd31d 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/ArchivaRuntimeConfigurationServiceTest.java @@ -18,7 +18,7 @@ package org.apache.archiva.rest.services; * under the License. */ -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; +import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; import org.apache.archiva.rest.api.model.UserManagerImplementationInformation; import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService; import org.fest.assertions.api.Assertions; @@ -37,25 +37,25 @@ public class ArchivaRuntimeConfigurationServiceTest public void nonnullConfiguration() throws Exception { - ArchivaRuntimeConfiguration archivaRuntimeConfiguration = + RedbackRuntimeConfiguration redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); - assertEquals( "jdo", archivaRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); + assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } @Test public void update() throws Exception { - ArchivaRuntimeConfiguration archivaRuntimeConfiguration = + RedbackRuntimeConfiguration redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); - assertEquals( "jdo", archivaRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); + assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); - archivaRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) ); + redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) ); - getArchivaRuntimeConfigurationService().updateArchivaRuntimeConfiguration( archivaRuntimeConfiguration ); + getArchivaRuntimeConfigurationService().updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration ); - archivaRuntimeConfiguration = getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); - assertEquals( "foo", archivaRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); + redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getArchivaRuntimeConfigurationAdmin(); + assertEquals( "foo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java index 31087baf8..6efdeea4c 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java @@ -19,12 +19,10 @@ package org.apache.archiva.web.runtime.ldap; */ import org.apache.archiva.admin.model.RepositoryAdminException; -import org.apache.archiva.admin.model.beans.ArchivaRuntimeConfiguration; import org.apache.archiva.admin.model.beans.LdapConfiguration; import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin; import org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory; import org.apache.archiva.redback.common.ldap.connection.LdapConnectionConfiguration; -import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index d78d1a3da..7152a58af 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -1151,10 +1151,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" } - ArchivaRuntimeConfiguration=function(userManagerImpls,ldapConfiguration,migratedFromRedbackConfiguration,configurationPropertiesEntries){ + RedbackRuntimeConfiguration=function(userManagerImpls,ldapConfiguration,migratedFromRedbackConfiguration,configurationPropertiesEntries){ var self=this; this.modified=ko.observable(false); - this.modified.subscribe(function(newValue){$.log("ArchivaRuntimeConfiguration modified")}); + this.modified.subscribe(function(newValue){$.log("RedbackRuntimeConfiguration modified")}); this.userManagerImpls=ko.observableArray(userManagerImpls); this.userManagerImpls.subscribe(function(newValue){self.modified(true)}); @@ -1171,22 +1171,22 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" }); } - mapArchivaRuntimeConfiguration=function(data){ - var archivaRuntimeConfiguration = - new ArchivaRuntimeConfiguration(data.userManagerImpls,mapLdapConfiguration(data.ldapConfiguration),data.migratedFromRedbackConfiguration); + mapRedbackRuntimeConfiguration=function(data){ + var redbackRuntimeConfiguration = + new RedbackRuntimeConfiguration(data.userManagerImpls,mapLdapConfiguration(data.ldapConfiguration),data.migratedFromRedbackConfiguration); var configurationPropertiesEntries = data.configurationPropertiesEntries == null ? []: $.each(data.configurationPropertiesEntries,function(item){ return new Entry(item.key, item.value,function(newValue){ - archivaRuntimeConfiguration.modified(true); + redbackRuntimeConfiguration.modified(true); }); }); if (!$.isArray(configurationPropertiesEntries)){ configurationPropertiesEntries=[]; } - archivaRuntimeConfiguration.configurationPropertiesEntries(configurationPropertiesEntries); - archivaRuntimeConfiguration.modified(false); - return archivaRuntimeConfiguration; + redbackRuntimeConfiguration.configurationPropertiesEntries(configurationPropertiesEntries); + redbackRuntimeConfiguration.modified(false); + return redbackRuntimeConfiguration; } @@ -1246,9 +1246,9 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" return null; } - ArchivaRuntimeConfigurationViewModel=function(archivaRuntimeConfiguration,userManagerImplementationInformations){ + RedbackRuntimeConfigurationViewModel=function(redbackRuntimeConfiguration,userManagerImplementationInformations){ var self=this; - this.archivaRuntimeConfiguration=ko.observable(archivaRuntimeConfiguration); + this.redbackRuntimeConfiguration=ko.observable(redbackRuntimeConfiguration); this.userManagerImplementationInformations=ko.observable(userManagerImplementationInformations); this.usedUserManagerImpls=ko.observableArray([]); @@ -1300,7 +1300,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" { type: "POST", contentType: 'application/json', - data:ko.toJSON(self.archivaRuntimeConfiguration().ldapConfiguration), + data:ko.toJSON(self.redbackRuntimeConfiguration().ldapConfiguration), dataType: 'json', success: function(data) { var message=$.i18n.prop('redback.runtime.ldap.verified'); @@ -1318,8 +1318,8 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" ); } - for(var i= 0;i
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().hostName"/>
@@ -941,7 +941,7 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().port"/>
@@ -950,7 +950,7 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().baseDn"/>
@@ -959,7 +959,7 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().bindDn"/>
@@ -968,7 +968,7 @@
+ data-bind="checked: redbackRuntimeConfiguration().ldapConfiguration().ssl"/>
@@ -977,7 +977,7 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().password"/>
@@ -986,7 +986,7 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().contextFactory"/>
@@ -995,15 +995,15 @@
+ data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().authenticationMethod"/>
-