You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/01/07 10:28:05 UTC
svn commit: r1556158 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/
plugins/maven2-repository/ plugins/maven2-repository/src/main/ja...
Author: olamy
Date: Tue Jan 7 09:28:05 2014
New Revision: 1556158
URL: http://svn.apache.org/r1556158
Log:
use strict matching for model mapper
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1556158&r1=1556157&r2=1556158&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Tue Jan 7 09:28:05 2014
@@ -52,7 +52,7 @@ import java.util.Set;
* @author Olivier Lamy
* @since 1.4-M4
*/
-@Service( "redbackRuntimeConfigurationAdmin#default" )
+@Service("redbackRuntimeConfigurationAdmin#default")
public class DefaultRedbackRuntimeConfigurationAdmin
extends AbstractRepositoryAdmin
implements RedbackRuntimeConfigurationAdmin, UserConfiguration
@@ -64,13 +64,19 @@ public class DefaultRedbackRuntimeConfig
private ArchivaConfiguration archivaConfiguration;
@Inject
- @Named( value = "userConfiguration#redback" )
+ @Named(value = "userConfiguration#redback")
private UserConfiguration userConfiguration;
@Inject
- @Named( value = "cache#users" )
+ @Named(value = "cache#users")
private Cache usersCache;
+ @Inject
+ public DefaultRedbackRuntimeConfigurationAdmin( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+
@PostConstruct
public void initialize()
throws UserConfigurationException
@@ -383,19 +389,16 @@ public class DefaultRedbackRuntimeConfig
{
redbackRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() );
}
- res.setLdapConfiguration(
- getModelMapper().map( redbackRuntimeConfiguration.getLdapConfiguration(),
- org.apache.archiva.configuration.LdapConfiguration.class ) );
+ res.setLdapConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getLdapConfiguration(),
+ org.apache.archiva.configuration.LdapConfiguration.class ) );
if ( redbackRuntimeConfiguration.getUsersCacheConfiguration() == null )
{
redbackRuntimeConfiguration.setUsersCacheConfiguration( new CacheConfiguration() );
}
-
- res.setUsersCacheConfiguration(
- getModelMapper().map( redbackRuntimeConfiguration.getUsersCacheConfiguration(),
- org.apache.archiva.configuration.CacheConfiguration.class ) );
+ res.setUsersCacheConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getUsersCacheConfiguration(),
+ org.apache.archiva.configuration.CacheConfiguration.class ) );
List<LdapGroupMapping> ldapGroupMappings = redbackRuntimeConfiguration.getLdapGroupMappings();
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1556158&r1=1556157&r2=1556158&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Tue Jan 7 09:28:05 2014
@@ -263,6 +263,9 @@
org.sonatype.aether.util,
org.sonatype.aether.util.artifact,
org.modelmapper,
+ org.modelmapper.config,
+ org.modelmapper.convention,
+ org.modelmapper.spi,
org.apache.archiva.maven2.model,
org.sonatype.aether.util.graph.selector,
org.apache.archiva.metadata.model.maven2,
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java?rev=1556158&r1=1556157&r2=1556158&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/TreeDependencyNodeVisitor.java Tue Jan 7 09:28:05 2014
@@ -21,6 +21,7 @@ package org.apache.archiva.dependency.tr
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.maven2.model.TreeEntry;
import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
import org.sonatype.aether.graph.DependencyNode;
import org.sonatype.aether.graph.DependencyVisitor;
@@ -48,8 +49,8 @@ public class TreeDependencyNodeVisitor
public boolean visitEnter( DependencyNode dependencyNode )
{
- TreeEntry entry = new TreeEntry(
- getModelMapper().map( dependencyNode.getDependency().getArtifact(), Artifact.class ) );
+ TreeEntry entry =
+ new TreeEntry( getModelMapper().map( dependencyNode.getDependency().getArtifact(), Artifact.class ) );
entry.getArtifact().setScope( dependencyNode.getDependency().getScope() );
entry.setParent( currentEntry );
currentEntry = entry;
@@ -75,6 +76,11 @@ public class TreeDependencyNodeVisitor
private static class ModelMapperHolder
{
private static ModelMapper MODEL_MAPPER = new ModelMapper();
+
+ static
+ {
+ MODEL_MAPPER.getConfiguration().setMatchingStrategy( MatchingStrategies.STRICT );
+ }
}
protected ModelMapper getModelMapper()