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 2011/04/12 09:16:40 UTC
svn commit: r1091315 [1/4] - in /archiva/trunk: ./ archiva-docs/
archiva-docs/src/site/apt/ archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modu...
Author: brett
Date: Tue Apr 12 07:16:34 2011
New Revision: 1091315
URL: http://svn.apache.org/viewvc?rev=1091315&view=rev
Log:
[MRM-1480]/[REDBACK-274] (CVE-2011-1026)
o upgrade to redback 1.2.8-SNAPSHOT
o configured struts2's token interceptor + use of <s:token> in affected actions to prevent CSRF issue
[MRM-1460] added selenium tests for CSRF fixes in affected pages
Merged: r1066067:1091313
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java
- copied unchanged from r1091299, archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java
Modified:
archiva/trunk/ (props changed)
archiva/trunk/archiva-docs/ (props changed)
archiva/trunk/archiva-docs/src/site/apt/release-notes.apt
archiva/trunk/archiva-modules/archiva-base/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/components-fragment.xml (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml (props changed)
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/ (props changed)
archiva/trunk/archiva-modules/archiva-web/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (contents, props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/disableProxyConnector.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/deleteArtifact.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java (props changed)
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/plugins/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/ (props changed)
archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/ (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/ (props changed)
archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/ (props changed)
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/ (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/ (props changed)
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ (props changed)
archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (props changed)
archiva/trunk/pom.xml
archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm (props changed)
archiva/trunk/skin/src/main/resources/css/maven-base.css (props changed)
archiva/trunk/skin/src/main/resources/css/print.css (props changed)
archiva/trunk/skin/src/main/resources/images/logos/ (props changed)
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 12 07:16:34 2011
@@ -7,3 +7,4 @@ target
.classpath
.project
.pom.xml.swp
+.idea
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025:721945-723577
/archiva/branches/MRM-541:686983-687034
-/archiva/branches/archiva-1.3.x:953645
+/archiva/branches/archiva-1.3.x:953645,1066068-1091313
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
/archiva/tags/archiva-1.3:898632
Propchange: archiva/trunk/archiva-docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-docs:721945-723577
/archiva/branches/MRM-541/archiva-docs:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-docs:919292,953645,1049412
+/archiva/branches/archiva-1.3.x/archiva-docs:919292,953645,1049412,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-docs:723609-726925
/archiva/branches/archiva-struts2/archiva-docs:699795-705848
/archiva/tags/archiva-1.3/archiva-docs:898632
Modified: archiva/trunk/archiva-docs/src/site/apt/release-notes.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/release-notes.apt?rev=1091315&r1=1091314&r2=1091315&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/release-notes.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/release-notes.apt Tue Apr 12 07:16:34 2011
@@ -19,6 +19,26 @@ Release Notes for Archiva 1.4
~~TODO
+* Compatibility Changes
+
+ * If upgrading from versions of Archiva earlier than 1.2.2, the list of libraries
+ in <<<wrapper.conf>>> has changed. If you have customized your copy of
+ <<<wrapper.conf>>>, please update it for compatibility with the version distributed
+ with the current release.
+
+* Security Vulnerabilities
+
+ * A CSRF security vulnerability (CVE-2010-3449) is present in 1.3.2 and earlier.
+
+ * An XSS security vulnerability (CVE-2011-0533) is present in 1.3.3 and earlier.
+
+ * Additional CSRF (CVE-2011-1026) and XSS security (CVE-2011-1077) vulnerabilities have been reported against 1.3.4
+ and earlier versions.
+
+ It is important that users using lower versions of Archiva upgrade to this version (or higher).
+
+ See {{{http://archiva.apache.org/security.html} Archiva Security}} for more details.
+
* Release Notes
The Archiva 1.4 feature set can be seen in the {{{tour/index.html} feature tour}}.
@@ -29,6 +49,16 @@ Release Notes for Archiva 1.4
~~TODO
+Previous Releases
+
+* Changes in Archiva 1.3.5
+
+ Released: <<14 March 2011>>
+
+** Task
+
+ * [MRM-1460] - Upgrade Archiva to Redback 1.2.7
+
* Changes in Archiva 1.3.4
Released: <<9 February 2011>>
Propchange: archiva/trunk/archiva-modules/archiva-base/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base:953645,1049375,1049384,1049389-1049399
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base:953645,1049375,1049384,1049389-1049399,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-base:898632
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:1049375,1049384,1049389-1049399
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:1049375,1049384,1049389-1049399,1066068-1091313
/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
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:721945-723577
/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-1.3.x/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/components-fragment.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/components-fragment.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/components-fragment.xml:960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:721945-723577
/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-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java:1066068-1091313
/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-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:1066068-1091313
/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-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,5 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:686983-687034
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:699795-705848
/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/archiva-web:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web:953645,1049409
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web:953645,1049409,1066068-1091313
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web:898632
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 12 07:16:34 2011
@@ -0,0 +1 @@
+/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test:1066068-1091313