Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix use of applicationContext.getBeansOfType instead of the old lookupMap. 

The key is now interface#hint whereas was only hint with plexus
arghh !


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1130140 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-06-01 13:07:26 +00:00
parent aaebb5d534
commit ee78778213
7 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

@ -103,14 +103,14 @@ public class DefaultRepositoryProxyConnectors
* plexus.requirement
*/
@Inject
@Named(value = "repositoryContentFactory#default")
@Named( value = "repositoryContentFactory#default" )
private RepositoryContentFactory repositoryFactory;
/**
* plexus.requirement
*/
@Inject
@Named(value="metadataTools#default")
@Named( value = "metadataTools#default" )
private MetadataTools metadataTools;
@Inject
@ -890,9 +890,12 @@ public class DefaultRepositoryProxyConnectors
{
for ( Entry<String, ? extends DownloadPolicy> entry : policies.entrySet() )
{
String key = entry.getKey();
// olamy with spring rolehint is now downloadPolicy#hint
// so substring after last # to get the hint as with plexus
String key = StringUtils.substringAfterLast( entry.getKey(), "#" );
DownloadPolicy policy = entry.getValue();
String defaultSetting = policy.getDefaultOption();
String setting = StringUtils.defaultString( settings.get( key ), defaultSetting );
log.debug( "Applying [{}] policy with [{}]", key, setting );

27
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
View File

@ -610,18 +610,33 @@ public abstract class AbstractProxyTestCase
protected void setManagedNewerThanRemote( File managedFile, File remoteFile )
{
assertTrue( "Managed File should exist: ", managedFile.exists() );
assertTrue( "Remote File should exist: ", remoteFile.exists() );
managedFile.setLastModified( remoteFile.lastModified() + 55000 );
setManagedNewerThanRemote(managedFile, remoteFile, 55000);
}
protected void setManagedOlderThanRemote( File managedFile, File remoteFile )
protected void setManagedNewerThanRemote( File managedFile, File remoteFile, long time )
{
assertTrue( "Managed File should exist: ", managedFile.exists() );
assertTrue( "Remote File should exist: ", remoteFile.exists() );
managedFile.setLastModified( remoteFile.lastModified() - 55000 );
managedFile.setLastModified( remoteFile.lastModified() + time );
assertTrue( managedFile.lastModified() > remoteFile.lastModified() );
}
protected void setManagedOlderThanRemote( File managedFile, File remoteFile )
{
setManagedOlderThanRemote(managedFile, remoteFile, 55000 );
}
protected void setManagedOlderThanRemote( File managedFile, File remoteFile, long time )
{
assertTrue( "Managed File should exist: ", managedFile.exists() );
assertTrue( "Remote File should exist: ", remoteFile.exists() );
managedFile.setLastModified( remoteFile.lastModified() - time );
assertTrue( managedFile.lastModified() < remoteFile.lastModified() );
}
protected void assertNotModified( File file, long expectedModificationTime )

7
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
View File

@ -23,6 +23,7 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ConfigurationListener;
import org.apache.maven.archiva.configuration.FileType;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
@ -75,12 +76,16 @@ public class MockConfiguration
public void initialize()
throws Exception
{
configuration.setRepositoryScanning( new RepositoryScanningConfiguration()
{
@Override
public List<FileType> getFileTypes()
{
return Collections.emptyList();
FileType fileType = new FileType();
fileType.setId( FileTypes.ARTIFACTS );
fileType.setPatterns( Collections.singletonList( "**/*" ) );
return Collections.singletonList( fileType );
}
} );
}

2
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/SnapshotTransferTest.java
View File

@ -229,7 +229,7 @@ public class SnapshotTransferTest
File expectedFile = new File( managedDefaultDir, path );
File remoteFile = new File( REPOPATH_PROXIED1, path );
setManagedNewerThanRemote( expectedFile, remoteFile );
setManagedNewerThanRemote( expectedFile, remoteFile, 12000000 );
long expectedTimestamp = expectedFile.lastModified();
ArtifactReference artifact = managedDefaultRepository.toArtifactReference( path );

4
archiva-modules/plugins/metadata-store-jcr/pom.xml
View File

@ -34,6 +34,10 @@
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>

26
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
View File

@ -39,17 +39,6 @@ import org.apache.jackrabbit.commons.JcrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.jcr.NamespaceRegistry;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@ -65,6 +54,17 @@ import javax.jcr.nodetype.NodeTypeManager;
import javax.jcr.nodetype.NodeTypeTemplate;
import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @todo below: revise storage format for project version metadata
@ -89,7 +89,7 @@ public class JcrMetadataRepository
private final Map<String, MetadataFacetFactory> metadataFacetFactories;
private static final Logger log = LoggerFactory.getLogger( JcrMetadataRepository.class );
private Logger log = LoggerFactory.getLogger( JcrMetadataRepository.class );
private Repository repository;
@ -856,7 +856,7 @@ public class JcrMetadataRepository
MetadataFacetFactory factory = metadataFacetFactories.get( name );
if ( factory == null )
{
log.error( "Attempted to load unknown project version metadata facet: " + name );
log.error( "Attempted to load unknown project version metadata facet: {}", name );
}
else
{

14
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
View File

@ -24,6 +24,7 @@ import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.commons.lang.StringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
@ -31,6 +32,7 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import java.util.HashMap;
import java.util.Map;
/**
@ -85,6 +87,18 @@ public class JcrRepositorySessionFactory
public void initialize()
{
metadataFacetFactories = applicationContext.getBeansOfType( MetadataFacetFactory.class );
// olamy with spring the "id" is now "metadataFacetFactory#hint"
// whereas was only hint with plexus so let remove metadataFacetFactory#
Map<String, MetadataFacetFactory> cleanedMetadataFacetFactories =
new HashMap<String, MetadataFacetFactory>( metadataFacetFactories.size() );
for ( Map.Entry<String, MetadataFacetFactory> entry : metadataFacetFactories.entrySet() )
{
cleanedMetadataFacetFactories.put( StringUtils.substringAfterLast( entry.getKey(), "#" ),
entry.getValue() );
}
metadataFacetFactories = cleanedMetadataFacetFactories;
JcrMetadataRepository metadataRepository = null;
try