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/02/12 02:43:25 UTC
svn commit: r909202 [1/4] - in /archiva/branches/MRM-1025: ./
archiva-docs/src/site/apt/adminguide/
archiva-docs/src/site/resources/images/tour/ archiva-docs/src/site/xdoc/tour/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/ma...
Author: brett
Date: Fri Feb 12 01:43:19 2010
New Revision: 909202
URL: http://svn.apache.org/viewvc?rev=909202&view=rev
Log:
Merged /archiva/trunk:r899478-909070
Added:
archiva/branches/MRM-1025/archiva-docs/src/site/resources/images/tour/audit-log.png
- copied unchanged from r909070, archiva/trunk/archiva-docs/src/site/resources/images/tour/audit-log.png
archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/audit-log.xml
- copied unchanged from r909070, archiva/trunk/archiva-docs/src/site/xdoc/tour/audit-log.xml
Modified:
archiva/branches/MRM-1025/ (props changed)
archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt
archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/index.xml
archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/maintenance.xml
archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/reports.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java (props changed)
archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/ (props changed)
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 (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ (props changed)
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (props changed)
archiva/branches/MRM-1025/skin/src/main/resources/META-INF/maven/site.vm (props changed)
archiva/branches/MRM-1025/skin/src/main/resources/css/maven-base.css (props changed)
archiva/branches/MRM-1025/skin/src/main/resources/css/print.css (props changed)
archiva/branches/MRM-1025/skin/src/main/resources/images/logos/ (props changed)
Propchange: archiva/branches/MRM-1025/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
/archiva/tags/archiva-1.3:898632
-/archiva/trunk:825850-899477
+/archiva/trunk:825850-909070
Modified: archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt?rev=909202&r1=909201&r2=909202&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt Fri Feb 12 01:43:19 2010
@@ -19,8 +19,8 @@
Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to
1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
- To do this, you can force Archiva to scan all the artifacts by ticking the 'Process All Artifacts' checkbox then clicking the 'Scan Repository Now'
- button in the Repositories page. Take note though that this feature is only available starting with version 1.2.3. Otherwise, you must execute
+ To do this, you can force Archiva to scan all the artifacts by ticking the <<<Process All Artifacts>>> checkbox then clicking the <<<Scan Repository Now>>>
+ button in the Repositories page. Take note though that this feature is only available starting with version 1.3. Otherwise, you must execute
<<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides and then force execute the repository scanning so
that the new index will be generated.
Modified: archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/index.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/index.xml?rev=909202&r1=909201&r2=909202&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/index.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/index.xml Fri Feb 12 01:43:19 2010
@@ -92,9 +92,15 @@
</a>
</td>
<td>
+ <a href="audit-log.html">
+ <img src="../images/tour/audit-log.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
+ 10. Audit Log Report
+ </a>
+ </td>
+ <td>
<a href="maintenance.html">
<img src="../images/tour/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
- 10. Maintenance
+ 11. Maintenance
</a>
</td>
</tr>
Modified: archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/maintenance.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/maintenance.xml?rev=909202&r1=909201&r2=909202&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/maintenance.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/maintenance.xml Fri Feb 12 01:43:19 2010
@@ -18,7 +18,7 @@
enable or disable these consumers.
</p>
<p>
- <a href="reports.html">Previous: Integrity Reports</a> |
+ <a href="audit-log.html">Previous: Audit Log Report</a> |
<strong>Maintenance</strong> |
<a href="index.html">Next: Feature Tour</a>
</p>
Modified: archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/reports.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/reports.xml?rev=909202&r1=909201&r2=909202&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/reports.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/xdoc/tour/reports.xml Fri Feb 12 01:43:19 2010
@@ -18,7 +18,7 @@
<p>
<a href="security.html">Previous: Role-based Security</a> |
<strong>Integrity Reports</strong> |
- <a href="maintenance.html">Next: Maintenance</a>
+ <a href="audit-log.html">Next: Audit Log Report</a>
</p>
</div>
</section>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:898632
-/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:825850-887039,887040-899477*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:825850-887039,887040-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:825850-887039,887040-899477*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-899477*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-909070*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:825850-882054,887040-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:825850-882054,887040-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:825850-882054,887040-899477
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:825850-882054,887040-909070
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 01:43:19 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-899477*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-909070*