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 09:55:08 UTC
svn commit: r1556150 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva...
Author: olamy
Date: Tue Jan 7 08:55:08 2014
New Revision: 1556150
URL: http://svn.apache.org/r1556150
Log:
use strict matching for model mapper
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1556150&r1=1556149&r2=1556150&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml Tue Jan 7 08:55:08 2014
@@ -261,6 +261,9 @@
org.springframework*;version="[3,4)",
org.apache.maven.index*,
org.apache.maven.wagon*,
+ org.modelmapper.config,
+ org.modelmapper.convention,
+ org.modelmapper.spi,
org.apache.archiva.redback.role,
org.apache.archiva.redback.users,
org.apache.archiva.redback.components.registry,
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.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/AbstractRepositoryAdmin.java?rev=1556150&r1=1556149&r2=1556150&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java Tue Jan 7 08:55:08 2014
@@ -29,6 +29,7 @@ import org.apache.archiva.configuration.
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.components.registry.Registry;
import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,15 +57,14 @@ public abstract class AbstractRepository
private ArchivaConfiguration archivaConfiguration;
@Inject
- @Named( value = "commons-configuration" )
+ @Named(value = "commons-configuration")
private Registry registry;
protected void triggerAuditEvent( String repositoryId, String resource, String action,
AuditInformation auditInformation )
{
User user = auditInformation == null ? null : auditInformation.getUser();
- AuditEvent event =
- new AuditEvent( repositoryId, user == null ? "null" : user.getUsername(), resource, action );
+ AuditEvent event = new AuditEvent( repositoryId, user == null ? "null" : user.getUsername(), resource, action );
event.setRemoteIP( auditInformation == null ? "null" : auditInformation.getRemoteAddr() );
for ( AuditListener listener : getAuditListeners() )
@@ -95,6 +95,12 @@ public abstract class AbstractRepository
private static class ModelMapperHolder
{
private static ModelMapper MODEL_MAPPER = new ModelMapper();
+
+ static
+ {
+ MODEL_MAPPER.getConfiguration().setMatchingStrategy( MatchingStrategies.STRICT );
+ }
+
}
protected ModelMapper getModelMapper()
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.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/AbstractRestService.java?rev=1556150&r1=1556149&r2=1556150&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java Tue Jan 7 08:55:08 2014
@@ -49,6 +49,7 @@ import org.apache.archiva.security.UserR
import org.apache.commons.lang.StringUtils;
import org.modelmapper.ModelMapper;
import org.modelmapper.PropertyMap;
+import org.modelmapper.convention.MatchingStrategies;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -323,6 +324,7 @@ public abstract class AbstractRestServic
static
{
MODEL_MAPPER.addMappings( new SearchResultHitMap() );
+ MODEL_MAPPER.getConfiguration().setMatchingStrategy( MatchingStrategies.STRICT );
}
}
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1556150&r1=1556149&r2=1556150&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jan 7 08:55:08 2014
@@ -70,9 +70,9 @@
<redback.version>2.2-SNAPSHOT</redback.version>
<redback.cache.version>2.2-SNAPSHOT</redback.cache.version>
<redback.quartz.version>2.1-SNAPSHOT</redback.quartz.version>
- <redback.registry.version>2.1</redback.registry.version>
- <redback.spring-utils.version>2.0</redback.spring-utils.version>
- <redback.taskqueue.version>2.0</redback.taskqueue.version>
+ <redback.registry.version>2.2-SNAPSHOT</redback.registry.version>
+ <redback.spring-utils.version>2.1-SNAPSHOT</redback.spring-utils.version>
+ <redback.taskqueue.version>2.1-SNAPSHOT</redback.taskqueue.version>
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>2.0-beta9</log4j.version>