You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/19 07:15:20 UTC
svn commit: r900664 [5/7] - in /archiva/branches/MRM-1025: ./ archiva-cli/
archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/
archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/apt/userguide/
archiva-docs/src/site/resources/images...
Copied: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java (from r899477, archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java?p2=archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java&p1=archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java&r1=899477&r2=900664&rev=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java Tue Jan 19 06:15:09 2010
@@ -1,4 +1,4 @@
-package org.apache.archiva.metadata.repository.stats;
+package org.apache.archiva.audit;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,9 @@
* under the License.
*/
+import java.text.DecimalFormat;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -29,30 +31,38 @@
import java.util.Map;
import junit.framework.TestCase;
-import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.audit.AuditEvent;
import org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
-public class RepositoryStatisticsManagerTest
+public class AuditManagerTest
extends TestCase
{
- private DefaultRepositoryStatisticsManager repositoryStatisticsManager;
-
- private static final String TEST_REPO_ID = "test-repo";
+ private DefaultAuditManager auditManager;
private MockControl metadataRepositoryControl;
private MetadataRepository metadataRepository;
- private static final String FIRST_TEST_SCAN = "2009/12/01/123456.789";
+ private static final String AUDIT_EVENT_BASE = "2010/01/18/123456.";
+
+ private static final String TEST_REPO_ID = "test-repo";
+
+ private static final String TEST_REPO_ID_2 = "repo2";
- private static final String SECOND_TEST_SCAN = "2009/12/02/012345.678";
+ private static final String TEST_USER = "test_user";
- private Map<String, RepositoryStatistics> statsCreated = new LinkedHashMap<String, RepositoryStatistics>();
+ private static final String TEST_RESOURCE_BASE = "test/resource";
+
+ private static final String TEST_IP_ADDRESS = "127.0.0.1";
+
+ private static final SimpleDateFormat TIMESTAMP_FORMAT = new SimpleDateFormat( AuditEvent.TIMESTAMP_FORMAT );
+
+ private static final DecimalFormat MILLIS_FORMAT = new DecimalFormat( "000" );
@Override
protected void setUp()
@@ -60,11 +70,11 @@
{
super.setUp();
- repositoryStatisticsManager = new DefaultRepositoryStatisticsManager();
+ auditManager = new DefaultAuditManager();
metadataRepositoryControl = MockControl.createControl( MetadataRepository.class );
metadataRepository = (MetadataRepository) metadataRepositoryControl.getMock();
- repositoryStatisticsManager.setMetadataRepository( metadataRepository );
+ auditManager.setMetadataRepository( metadataRepository );
ManagedRepositoryConfiguration repository = new ManagedRepositoryConfiguration();
repository.setId( TEST_REPO_ID );
@@ -76,489 +86,422 @@
contentFactory.getManagedRepositoryContent( TEST_REPO_ID );
control.setDefaultReturnValue( content );
control.replay();
- repositoryStatisticsManager.setRepositoryContentFactory( contentFactory );
}
- public void testGetLatestStats()
+ public void testGetMostRecentEvents()
throws ParseException
{
- Date endTime = new Date( RepositoryStatistics.SCAN_TIMESTAMP.parse( SECOND_TEST_SCAN ).getTime() + 60000 );
+ metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(),
+ Collections.singletonList( TEST_REPO_ID ) );
- RepositoryStatistics stats = new RepositoryStatistics();
- stats.setScanStartTime( RepositoryStatistics.SCAN_TIMESTAMP.parse( SECOND_TEST_SCAN ) );
- stats.setScanEndTime( endTime );
- stats.setTotalArtifactFileSize( 1314527915L );
- stats.setNewFileCount( 123 );
- stats.setTotalArtifactCount( 10386 );
- stats.setTotalProjectCount( 2031 );
- stats.setTotalGroupCount( 529 );
- stats.setTotalFileCount( 56229 );
+ int numEvents = 11;
+ List<String> eventNames = new ArrayList<String>( numEvents );
+ for ( int i = 0; i < numEvents; i++ )
+ {
+ eventNames.add( AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) );
+ }
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Arrays.asList( FIRST_TEST_SCAN, SECOND_TEST_SCAN ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, SECOND_TEST_SCAN ),
- stats );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ), eventNames );
+
+ for ( String name : eventNames.subList( 1, eventNames.size() ) )
+ {
+ AuditEvent event = createTestEvent( name );
+
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name ), event );
+ }
metadataRepositoryControl.replay();
- stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID );
- assertNotNull( stats );
- assertEquals( 1314527915L, stats.getTotalArtifactFileSize() );
- assertEquals( 123, stats.getNewFileCount() );
- assertEquals( 10386, stats.getTotalArtifactCount() );
- assertEquals( 2031, stats.getTotalProjectCount() );
- assertEquals( 529, stats.getTotalGroupCount() );
- assertEquals( 56229, stats.getTotalFileCount() );
- assertEquals( SECOND_TEST_SCAN, RepositoryStatistics.SCAN_TIMESTAMP.format( stats.getScanStartTime() ) );
- assertEquals( SECOND_TEST_SCAN, stats.getName() );
- assertEquals( endTime, stats.getScanEndTime() );
+ List<AuditEvent> events = auditManager.getMostRecentAuditEvents();
+ assertNotNull( events );
+ assertEquals( numEvents - 1, events.size() );
+ int expectedTimestampCounter = numEvents - 1;
+ for ( AuditEvent event : events )
+ {
+ String num = MILLIS_FORMAT.format( expectedTimestampCounter );
+ assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE + "/" + num );
+ expectedTimestampCounter--;
+ }
metadataRepositoryControl.verify();
}
- public void testGetLatestStatsWhenEmpty()
+ private static AuditEvent createTestEvent( String name )
+ throws ParseException
+ {
+ return createTestEvent( TEST_REPO_ID, name );
+ }
+
+ private static AuditEvent createTestEvent( String repositoryId, String name )
+ throws ParseException
+ {
+ AuditEvent event = new AuditEvent();
+ event.setTimestamp( TIMESTAMP_FORMAT.parse( name ) );
+ event.setAction( AuditEvent.UPLOAD_FILE );
+ event.setRemoteIP( TEST_IP_ADDRESS );
+ event.setRepositoryId( repositoryId );
+ event.setUserId( TEST_USER );
+ event.setResource( TEST_RESOURCE_BASE + "/" + name.substring( AUDIT_EVENT_BASE.length() ) );
+ return event;
+ }
+
+ public void testGetMostRecentEventsLessThan10()
+ throws ParseException
{
+ metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(),
+ Collections.singletonList( TEST_REPO_ID ) );
+ int numEvents = 5;
+ List<String> eventNames = new ArrayList<String>( numEvents );
+ for ( int i = 0; i < numEvents; i++ )
+ {
+ eventNames.add( AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i ) );
+ }
+
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Collections.emptyList() );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ), eventNames );
+
+ for ( String name : eventNames )
+ {
+ AuditEvent event = createTestEvent( name );
+
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name ), event );
+ }
metadataRepositoryControl.replay();
- RepositoryStatistics stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID );
- assertNull( stats );
+ List<AuditEvent> events = auditManager.getMostRecentAuditEvents();
+ assertNotNull( events );
+ assertEquals( numEvents, events.size() );
+ int expectedTimestampCounter = numEvents - 1;
+ for ( AuditEvent event : events )
+ {
+ String num = MILLIS_FORMAT.format( expectedTimestampCounter );
+ assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE + "/" + num );
+ expectedTimestampCounter--;
+ }
metadataRepositoryControl.verify();
}
- public void testAddNewStats()
+ public void testGetMostRecentEventsInterleavedRepositories()
+ throws ParseException
{
- Date current = new Date();
- Date startTime = new Date( current.getTime() - 12345 );
-
- RepositoryStatistics stats = createTestStats( startTime, current );
-
- walkRepository( 1 );
+ metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(),
+ Arrays.asList( TEST_REPO_ID, TEST_REPO_ID_2 ) );
+ int numEvents = 11;
+ Map<String, List<String>> eventNames = new LinkedHashMap<String, List<String>>();
+ List<AuditEvent> events = new ArrayList<AuditEvent>();
+ eventNames.put( TEST_REPO_ID, new ArrayList<String>() );
+ eventNames.put( TEST_REPO_ID_2, new ArrayList<String>() );
+ for ( int i = 0; i < numEvents; i++ )
+ {
+ String name = AUDIT_EVENT_BASE + MILLIS_FORMAT.format( i );
+ String repositoryId = i % 2 == 0 ? TEST_REPO_ID : TEST_REPO_ID_2;
+ eventNames.get( repositoryId ).add( name );
+ events.add( createTestEvent( repositoryId, name ) );
+ }
- metadataRepository.addMetadataFacet( TEST_REPO_ID, stats );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Arrays.asList( stats.getName() ) );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ), eventNames.get( TEST_REPO_ID ) );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, stats.getName() ),
- stats );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID_2, AuditEvent.FACET_ID ),
+ eventNames.get( TEST_REPO_ID_2 ) );
+ for ( AuditEvent event : events.subList( 1, events.size() ) )
+ {
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacet( event.getRepositoryId(), AuditEvent.FACET_ID, event.getName() ),
+ event );
+ }
metadataRepositoryControl.replay();
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime, current, 56345, 45 );
-
- stats = repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID );
- assertNotNull( stats );
- assertEquals( 246900, stats.getTotalArtifactFileSize() );
- assertEquals( 45, stats.getNewFileCount() );
- assertEquals( 20, stats.getTotalArtifactCount() );
- assertEquals( 5, stats.getTotalProjectCount() );
- assertEquals( 4, stats.getTotalGroupCount() );
- assertEquals( 56345, stats.getTotalFileCount() );
- assertEquals( current.getTime() - 12345, stats.getScanStartTime().getTime() );
- assertEquals( current, stats.getScanEndTime() );
+ events = auditManager.getMostRecentAuditEvents();
+ assertNotNull( events );
+ assertEquals( numEvents - 1, events.size() );
+ int expectedTimestampCounter = numEvents - 1;
+ for ( AuditEvent event : events )
+ {
+ String num = MILLIS_FORMAT.format( expectedTimestampCounter );
+ assertEvent( event, AUDIT_EVENT_BASE + num, TEST_RESOURCE_BASE + "/" + num,
+ expectedTimestampCounter % 2 == 0 ? TEST_REPO_ID : TEST_REPO_ID_2 );
+ expectedTimestampCounter--;
+ }
metadataRepositoryControl.verify();
}
- public void testDeleteStats()
+ private static void assertEvent( AuditEvent event, String name, String resource )
{
- walkRepository( 2 );
-
- Date current = new Date();
+ assertEvent( event, name, resource, TEST_REPO_ID );
+ }
- Date startTime1 = new Date( current.getTime() - 12345 );
- RepositoryStatistics stats1 = createTestStats( startTime1, new Date( current.getTime() - 6000 ) );
- metadataRepository.addMetadataFacet( TEST_REPO_ID, stats1 );
+ private static void assertEvent( AuditEvent event, String name, String resource, String repositoryId )
+ {
+ assertEquals( name, TIMESTAMP_FORMAT.format( event.getTimestamp() ) );
+ assertEquals( AuditEvent.UPLOAD_FILE, event.getAction() );
+ assertEquals( TEST_IP_ADDRESS, event.getRemoteIP() );
+ assertEquals( repositoryId, event.getRepositoryId() );
+ assertEquals( TEST_USER, event.getUserId() );
+ assertEquals( resource, event.getResource() );
+ }
- Date startTime2 = new Date( current.getTime() - 3000 );
- RepositoryStatistics stats2 = createTestStats( startTime2, current );
- metadataRepository.addMetadataFacet( TEST_REPO_ID, stats2 );
+ public void testGetMostRecentEventsWhenEmpty()
+ {
+ metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(),
+ Collections.singletonList( TEST_REPO_ID ) );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Arrays.asList( stats1.getName(), stats2.getName() ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, stats2.getName() ),
- stats2 );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ), Collections.emptyList() );
+ metadataRepositoryControl.replay();
- metadataRepository.removeMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID );
+ assertTrue( auditManager.getMostRecentAuditEvents().isEmpty() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Collections.emptyList() );
-
- metadataRepositoryControl.replay();
+ metadataRepositoryControl.verify();
+ }
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime1, stats1.getScanEndTime(), 56345,
- 45 );
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, startTime2, stats2.getScanEndTime(), 56345,
- 45 );
+ public void testAddAuditEvent()
+ throws ParseException
+ {
+ String name = TIMESTAMP_FORMAT.format( new Date() );
+ AuditEvent event = createTestEvent( name );
- assertNotNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) );
+ metadataRepository.addMetadataFacet( TEST_REPO_ID, event );
- repositoryStatisticsManager.deleteStatistics( TEST_REPO_ID );
+ metadataRepositoryControl.replay();
- assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) );
+ auditManager.addAuditEvent( event );
metadataRepositoryControl.verify();
}
- public void testDeleteStatsWhenEmpty()
+ public void testAddAuditEventNoRepositoryId()
+ throws ParseException
{
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ),
- Collections.emptyList(), 2 );
- metadataRepository.removeMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID );
+ String name = TIMESTAMP_FORMAT.format( new Date() );
+ AuditEvent event = createTestEvent( null, name );
+
+ // should just be ignored
metadataRepositoryControl.replay();
- assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) );
+ auditManager.addAuditEvent( event );
- repositoryStatisticsManager.deleteStatistics( TEST_REPO_ID );
+ metadataRepositoryControl.verify();
+ }
- assertNull( repositoryStatisticsManager.getLastStatistics( TEST_REPO_ID ) );
+ public void testDeleteStats()
+ {
+ metadataRepository.removeMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID );
+
+ metadataRepositoryControl.replay();
+
+ auditManager.deleteAuditEvents( TEST_REPO_ID );
metadataRepositoryControl.verify();
}
- public void testGetStatsRangeInside()
+ public void testGetEventsRangeInside()
+ throws ParseException
{
- walkRepository( 3 );
-
Date current = new Date();
- addStats( new Date( current.getTime() - 12345 ), new Date( current.getTime() - 6000 ) );
- addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) );
- addStats( new Date( current.getTime() - 1000 ), current );
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent = createTestEvent( name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
- ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ), keys );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ),
+ Arrays.asList( name1, name2, name3 ) );
// only match the middle one
- String key = keys.get( 1 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name2 ), expectedEvent );
metadataRepositoryControl.replay();
- for ( RepositoryStatistics stats : statsCreated.values() )
- {
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(),
- stats.getScanEndTime(), 56345, 45 );
- }
-
- List<RepositoryStatistics> list =
- repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( current.getTime() - 4000 ),
- new Date( current.getTime() - 2000 ) );
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( TEST_REPO_ID, new Date( current.getTime() - 4000 ),
+ new Date( current.getTime() - 2000 ) );
- assertEquals( 1, list.size() );
- assertEquals( new Date( current.getTime() - 3000 ), list.get( 0 ).getScanStartTime() );
+ assertEquals( 1, events.size() );
+ assertEvent( events.get( 0 ), name2, expectedEvent.getResource() );
metadataRepositoryControl.verify();
}
- public void testGetStatsRangeUpperOutside()
+ public void testGetEventsRangeUpperOutside()
+ throws ParseException
{
- walkRepository( 3 );
-
Date current = new Date();
- addStats( new Date( current.getTime() - 12345 ), new Date( current.getTime() - 6000 ) );
- addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) );
- addStats( new Date( current.getTime() - 1000 ), current );
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent2 = createTestEvent( name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
+ AuditEvent expectedEvent3 = createTestEvent( name3 );
- ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ), keys );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ),
+ Arrays.asList( name1, name2, name3 ) );
- String key = keys.get( 1 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
- key = keys.get( 2 );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name2 ), expectedEvent2 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name3 ), expectedEvent3 );
metadataRepositoryControl.replay();
- for ( RepositoryStatistics stats : statsCreated.values() )
- {
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(),
- stats.getScanEndTime(), 56345, 45 );
- }
-
- List<RepositoryStatistics> list =
- repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( current.getTime() - 4000 ),
- current );
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( TEST_REPO_ID, new Date( current.getTime() - 4000 ), current );
- assertEquals( 2, list.size() );
- assertEquals( new Date( current.getTime() - 3000 ), list.get( 1 ).getScanStartTime() );
- assertEquals( new Date( current.getTime() - 1000 ), list.get( 0 ).getScanStartTime() );
+ assertEquals( 2, events.size() );
+ assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
+ assertEvent( events.get( 1 ), name2, expectedEvent2.getResource() );
metadataRepositoryControl.verify();
}
- public void testGetStatsRangeLowerOutside()
+ public void testGetEventsRangeLowerOutside()
+ throws ParseException
{
- walkRepository( 3 );
-
Date current = new Date();
- addStats( new Date( current.getTime() - 12345 ), new Date( current.getTime() - 6000 ) );
- addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) );
- addStats( new Date( current.getTime() - 1000 ), current );
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ AuditEvent expectedEvent1 = createTestEvent( name1 );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent2 = createTestEvent( name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
- ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ), keys );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ),
+ Arrays.asList( name1, name2, name3 ) );
- String key = keys.get( 0 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
- key = keys.get( 1 );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name1 ), expectedEvent1 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name2 ), expectedEvent2 );
metadataRepositoryControl.replay();
- for ( RepositoryStatistics stats : statsCreated.values() )
- {
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(),
- stats.getScanEndTime(), 56345, 45 );
- }
-
- List<RepositoryStatistics> list =
- repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ),
- new Date( current.getTime() - 2000 ) );
-
- assertEquals( 2, list.size() );
- assertEquals( new Date( current.getTime() - 12345 ), list.get( 1 ).getScanStartTime() );
- assertEquals( new Date( current.getTime() - 3000 ), list.get( 0 ).getScanStartTime() );
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ),
+ new Date( current.getTime() - 2000 ) );
+
+ assertEquals( 2, events.size() );
+ assertEvent( events.get( 0 ), name2, expectedEvent2.getResource() );
+ assertEvent( events.get( 1 ), name1, expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
- public void testGetStatsRangeLowerAndUpperOutside()
+ public void testGetEventsRangeLowerAndUpperOutside()
+ throws ParseException
{
- walkRepository( 3 );
-
Date current = new Date();
- addStats( new Date( current.getTime() - 12345 ), new Date( current.getTime() - 6000 ) );
- addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) );
- addStats( new Date( current.getTime() - 1000 ), current );
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ AuditEvent expectedEvent1 = createTestEvent( name1 );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent2 = createTestEvent( name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
+ AuditEvent expectedEvent3 = createTestEvent( name3 );
- ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ), keys );
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ),
+ Arrays.asList( name1, name2, name3 ) );
- String key = keys.get( 0 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
- key = keys.get( 1 );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name1 ), expectedEvent1 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
- key = keys.get( 2 );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name2 ), expectedEvent2 );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacet( TEST_REPO_ID, RepositoryStatistics.FACET_ID, key ),
- statsCreated.get( key ) );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name3 ), expectedEvent3 );
metadataRepositoryControl.replay();
- for ( RepositoryStatistics stats : statsCreated.values() )
- {
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(),
- stats.getScanEndTime(), 56345, 45 );
- }
-
- List<RepositoryStatistics> list =
- repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ),
- current );
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ), current );
- assertEquals( 3, list.size() );
- assertEquals( new Date( current.getTime() - 12345 ), list.get( 2 ).getScanStartTime() );
- assertEquals( new Date( current.getTime() - 3000 ), list.get( 1 ).getScanStartTime() );
- assertEquals( new Date( current.getTime() - 1000 ), list.get( 0 ).getScanStartTime() );
+ assertEquals( 3, events.size() );
+ assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
+ assertEvent( events.get( 1 ), name2, expectedEvent2.getResource() );
+ assertEvent( events.get( 2 ), name1, expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
- public void testGetStatsRangeNotInside()
+ public void testGetEventsRangeMultipleRepositories()
+ throws ParseException
{
- walkRepository( 3 );
+ metadataRepositoryControl.expectAndReturn( metadataRepository.getRepositories(),
+ Arrays.asList( TEST_REPO_ID, TEST_REPO_ID_2 ) );
Date current = new Date();
- addStats( new Date( current.getTime() - 12345 ), new Date( current.getTime() - 6000 ) );
- addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) );
- addStats( new Date( current.getTime() - 1000 ), current );
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ AuditEvent expectedEvent1 = createTestEvent( TEST_REPO_ID, name1 );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent2 = createTestEvent( TEST_REPO_ID_2, name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
+ AuditEvent expectedEvent3 = createTestEvent( TEST_REPO_ID, name3 );
+
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ), Arrays.asList( name1, name3 ) );
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacets( TEST_REPO_ID_2, AuditEvent.FACET_ID ), Arrays.asList( name2 ) );
- ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() );
metadataRepositoryControl.expectAndReturn(
- metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ), keys );
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name1 ), expectedEvent1 );
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacet( TEST_REPO_ID_2, AuditEvent.FACET_ID, name2 ), expectedEvent2 );
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacet( TEST_REPO_ID, AuditEvent.FACET_ID, name3 ), expectedEvent3 );
metadataRepositoryControl.replay();
- for ( RepositoryStatistics stats : statsCreated.values() )
- {
- repositoryStatisticsManager.addStatisticsAfterScan( TEST_REPO_ID, stats.getScanStartTime(),
- stats.getScanEndTime(), 56345, 45 );
- }
-
- List<RepositoryStatistics> list =
- repositoryStatisticsManager.getStatisticsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ),
- new Date( current.getTime() - 16000 ) );
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( null, new Date( current.getTime() - 20000 ), current );
- assertEquals( 0, list.size() );
+ assertEquals( 3, events.size() );
+ assertEvent( events.get( 0 ), name3, expectedEvent3.getResource() );
+ assertEvent( events.get( 1 ), name2, expectedEvent2.getResource(), TEST_REPO_ID_2 );
+ assertEvent( events.get( 2 ), name1, expectedEvent1.getResource() );
metadataRepositoryControl.verify();
}
- private void addStats( Date startTime, Date endTime )
+ public void testGetEventsRangeNotInside()
+ throws ParseException
{
- RepositoryStatistics stats = createTestStats( startTime, endTime );
- metadataRepository.addMetadataFacet( TEST_REPO_ID, stats );
- statsCreated.put( stats.getName(), stats );
- }
+ Date current = new Date();
- private ArtifactMetadata createArtifact( String namespace, String projectId, String projectVersion, String type )
- {
- ArtifactMetadata metadata = new ArtifactMetadata();
- metadata.setRepositoryId( TEST_REPO_ID );
- metadata.setId( projectId + "-" + projectVersion + "." + type );
- metadata.setProject( projectId );
- metadata.setSize( 12345L );
- metadata.setVersion( projectVersion );
- metadata.setNamespace( namespace );
- return metadata;
- }
+ String name1 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 12345 ) );
+ AuditEvent expectedEvent1 = createTestEvent( name1 );
+ Date expectedTimestamp = new Date( current.getTime() - 3000 );
+ String name2 = TIMESTAMP_FORMAT.format( expectedTimestamp );
+ AuditEvent expectedEvent2 = createTestEvent( name2 );
+ String name3 = TIMESTAMP_FORMAT.format( new Date( current.getTime() - 1000 ) );
+ AuditEvent expectedEvent3 = createTestEvent( name3 );
- private RepositoryStatistics createTestStats( Date startTime, Date endTime )
- {
- RepositoryStatistics stats = new RepositoryStatistics();
- stats.setScanStartTime( startTime );
- stats.setScanEndTime( endTime );
- stats.setTotalArtifactFileSize( 20 * 12345L );
- stats.setNewFileCount( 45 );
- stats.setTotalArtifactCount( 20 );
- stats.setTotalProjectCount( 5 );
- stats.setTotalGroupCount( 4 );
- stats.setTotalFileCount( 56345 );
- stats.setTotalCountForType( "jar", 10 );
- stats.setTotalCountForType( "pom", 10 );
- return stats;
- }
+ metadataRepositoryControl.expectAndReturn(
+ metadataRepository.getMetadataFacets( TEST_REPO_ID, AuditEvent.FACET_ID ),
+ Arrays.asList( name1, name2, name3 ) );
- private void walkRepository( int count )
- {
- for ( int i = 0; i < count; i++ )
- {
- metadataRepositoryControl.expectAndReturn( metadataRepository.getRootNamespaces( TEST_REPO_ID ),
- Arrays.asList( "com", "org" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjects( TEST_REPO_ID, "com" ),
- Arrays.asList() );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getNamespaces( TEST_REPO_ID, "com" ),
- Arrays.asList( "example" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getNamespaces( TEST_REPO_ID, "com.example" ),
- Arrays.asList() );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjects( TEST_REPO_ID, "com.example" ),
- Arrays.asList( "example-project" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjectVersions( TEST_REPO_ID, "com.example", "example-project" ),
- Arrays.asList( "1.0", "1.1" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "com.example", "example-project", "1.0" ),
- Arrays.asList( createArtifact( "com.example", "example-project", "1.0", "jar" ),
- createArtifact( "com.example", "example-project", "1.0", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "com.example", "example-project", "1.1" ),
- Arrays.asList( createArtifact( "com.example", "example-project", "1.1", "jar" ),
- createArtifact( "com.example", "example-project", "1.1", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getNamespaces( TEST_REPO_ID, "org" ),
- Arrays.asList( "apache", "codehaus" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getNamespaces( TEST_REPO_ID, "org.apache" ),
- Arrays.asList( "archiva", "maven" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjects( TEST_REPO_ID, "org.apache" ),
- Arrays.asList() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getNamespaces( TEST_REPO_ID, "org.apache.archiva" ), Arrays.asList() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjects( TEST_REPO_ID, "org.apache.archiva" ),
- Arrays.asList( "metadata-repository-api", "metadata-model" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjectVersions( TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api" ),
- Arrays.asList( "1.3-SNAPSHOT", "1.3" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api",
- "1.3-SNAPSHOT" ),
- Arrays.asList( createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT", "jar" ),
- createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3-SNAPSHOT",
- "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-repository-api", "1.3" ),
- Arrays.asList( createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3", "jar" ),
- createArtifact( "org.apache.archiva", "metadata-repository-api", "1.3", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjectVersions( TEST_REPO_ID, "org.apache.archiva", "metadata-model" ),
- Arrays.asList( "1.3-SNAPSHOT", "1.3" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT" ),
- Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT", "jar" ),
- createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT",
- "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3" ),
- Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3", "jar" ),
- createArtifact( "org.apache.archiva", "metadata-model", "1.3", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getNamespaces( TEST_REPO_ID, "org.apache.maven" ), Arrays.asList() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjects( TEST_REPO_ID, "org.apache.maven" ), Arrays.asList( "maven-model" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjectVersions( TEST_REPO_ID, "org.apache.maven", "maven-model" ),
- Arrays.asList( "2.2.1" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.maven", "maven-model", "2.2.1" ),
- Arrays.asList( createArtifact( "org.apache.archiva", "maven-model", "2.2.1", "jar" ),
- createArtifact( "org.apache.archiva", "maven-model", "2.2.1", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getNamespaces( TEST_REPO_ID, "org.codehaus" ),
- Arrays.asList( "plexus" ) );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjects( TEST_REPO_ID, "org" ),
- Arrays.asList() );
- metadataRepositoryControl.expectAndReturn( metadataRepository.getProjects( TEST_REPO_ID, "org.codehaus" ),
- Arrays.asList() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getNamespaces( TEST_REPO_ID, "org.codehaus.plexus" ), Arrays.asList() );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjects( TEST_REPO_ID, "org.codehaus.plexus" ),
- Arrays.asList( "plexus-spring" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getProjectVersions( TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring" ),
- Arrays.asList( "1.0", "1.1", "1.2" ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.0" ),
- Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.0", "jar" ),
- createArtifact( "org.codehaus.plexus", "plexus-spring", "1.0", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.1" ),
- Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.1", "jar" ),
- createArtifact( "org.codehaus.plexus", "plexus-spring", "1.1", "pom" ) ) );
- metadataRepositoryControl.expectAndReturn(
- metadataRepository.getArtifacts( TEST_REPO_ID, "org.codehaus.plexus", "plexus-spring", "1.2" ),
- Arrays.asList( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.2", "jar" ),
- createArtifact( "org.codehaus.plexus", "plexus-spring", "1.2", "pom" ) ) );
- }
+ metadataRepositoryControl.replay();
+
+ List<AuditEvent> events =
+ auditManager.getAuditEventsInRange( TEST_REPO_ID, new Date( current.getTime() - 20000 ),
+ new Date( current.getTime() - 16000 ) );
+
+ assertEquals( 0, events.size() );
+
+ metadataRepositoryControl.verify();
}
-}
+}
\ No newline at end of file
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-899477
Modified: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.archiva</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>maven2-repository</artifactId>
<name>Maven 2.x Repository Support</name>
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-899477
Modified: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java Tue Jan 19 06:15:09 2010
@@ -32,4 +32,9 @@
{
return new MavenProjectFacet();
}
+
+ public MetadataFacet createMetadataFacet( String repositoryId, String name )
+ {
+ throw new UnsupportedOperationException( "There is no valid name for project version facets" );
+ }
}
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -1 +1 @@
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:825850-885005,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:825850-883981,883982-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:825850-883981,883982-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:825850-883981,883982-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:825850-883981,883982-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:825850-883981,883982-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-899477