You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/19 07:15:20 UTC

svn commit: r900664 [1/7] - in /archiva/branches/MRM-1025: ./ archiva-cli/ archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/ archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/apt/userguide/ archiva-docs/src/site/resources/images...

Author: brett
Date: Tue Jan 19 06:15:09 2010
New Revision: 900664

URL: http://svn.apache.org/viewvc?rev=900664&view=rev
Log:
merged recent changes from trunk, and reimplemented incoming audit log functionality as a plugin using the metadata repository

Added:
    archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/auditlog-report.apt
      - copied unchanged from r899477, archiva/trunk/archiva-docs/src/site/apt/userguide/auditlog-report.apt
    archiva/branches/MRM-1025/archiva-docs/src/site/resources/images/latest-events.png
      - copied unchanged from r899477, archiva/trunk/archiva-docs/src/site/resources/images/latest-events.png
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/
      - copied from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1
      - copied unchanged from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
      - copied unchanged from r899477, archiva/trunk/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/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
      - copied, changed from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp
      - copied, changed from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/   (with props)
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/pom.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java   (contents, props changed)
      - copied, changed from r899477, archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java   (contents, props changed)
      - copied, changed from r899477, archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/
    archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java   (contents, props changed)
      - copied, changed from r899477, archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/
Modified:
    archiva/branches/MRM-1025/   (props changed)
    archiva/branches/MRM-1025/archiva-cli/pom.xml
    archiva/branches/MRM-1025/archiva-docs/pom.xml
    archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/upgrade.apt
    archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/webapp.apt
    archiva/branches/MRM-1025/archiva-docs/src/site/apt/release-notes.apt
    archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/index.apt
    archiva/branches/MRM-1025/archiva-docs/src/site/site.xml
    archiva/branches/MRM-1025/archiva-jetty/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.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-consumers/archiva-core-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
    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-base/archiva-repository-layer/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
    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/pom.xml
    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/pom.xml
    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-scheduler/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-security/src/main/resources/META-INF/redback/redback.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.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/SearchTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.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-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.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   (contents, props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
    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/UploadActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
    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/admin/connectors/proxy/EditProxyConnectorActionTest.xml
    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/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
    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/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactoryTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/pom.xml
    archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/MetadataFacetFactory.java
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml
    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/metadata/pom.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml
    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   (contents, 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/metadata-repository-file/pom.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
    archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
    archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/pom.xml
    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   (contents, 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   (contents, 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   (contents, props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java   (contents, props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java   (contents, 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   (contents, props changed)
    archiva/branches/MRM-1025/archiva-modules/pom.xml
    archiva/branches/MRM-1025/pom.xml

Propchange: archiva/branches/MRM-1025/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,5 @@
 /archiva/branches/MRM-541:686983-687034
 /archiva/branches/archiva-search-improvements:723609-726925
 /archiva/branches/archiva-struts2:699795-705848
-/archiva/trunk:825850-891135
+/archiva/tags/archiva-1.3:898632
+/archiva/trunk:825850-899477

Modified: archiva/branches/MRM-1025/archiva-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-cli/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-cli/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-cli/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
@@ -35,13 +35,12 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-tree-consumer</artifactId>
-      <version>1.3-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-metadata-consumer</artifactId>
-      <version>1.3-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -101,7 +100,7 @@
               </transformers>
               <artifactSet>
                 <excludes>
-		  <exclude>xerces:xercesImpl</exclude>
+		              <exclude>xerces:xercesImpl</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
                   <exclude>xalan:xalan</exclude>
                   <exclude>commons-beanutils:commons-beanutils</exclude>

Modified: archiva/branches/MRM-1025/archiva-docs/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/pom.xml Tue Jan 19 06:15:09 2010
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-docs</artifactId>

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=900664&r1=900663&r2=900664&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 Tue Jan 19 06:15:09 2010
@@ -49,3 +49,9 @@
    []
 
    If upgrading from a version lower than 1.2.2, you might also need to alter the lengths of the above fields as there is no upgrade task currently available for this.
+   
+   Since Archiva 1.2.2, the Jetty version has been upgraded to 6.1.19.
+   If upgrading to Archiva 1.2.2 (or higher versions), there is a need to update the library contents listed in
+   <<<$ARCHIVA_BASE/conf/wrapper.conf>>> with the ones included in the new distribution especially if the
+   <<<$ARCHIVA_BASE>>> directory is separate from the installation.
+   

Modified: archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/webapp.apt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/webapp.apt?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/webapp.apt (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/apt/adminguide/webapp.apt Tue Jan 19 06:15:09 2010
@@ -20,7 +20,8 @@
 
    * Copy the war file into the new directory
 
-   * Create a <<<\<tomcat home\>/conf/Catalina/localhost/archiva.xml>>> file with the following data (replace the database paths with a suitable location):
+   * Create a <<<\<tomcat home\>/conf/Catalina/localhost/archiva.xml>>> file with the following data (replace the database paths with a suitable location). When using
+   Tomcat 6.0+, do not include the first line (XML encoding) in the <<<archiva.xml>>> configuration specified below to avoid parsing errors during startup: 
 
 +-------------------------------------------------------------------------+
  <?xml version="1.0" encoding="UTF-8"?>

Modified: archiva/branches/MRM-1025/archiva-docs/src/site/apt/release-notes.apt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/apt/release-notes.apt?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/apt/release-notes.apt (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/apt/release-notes.apt Tue Jan 19 06:15:09 2010
@@ -1,10 +1,10 @@
  -----
- Release Notes for Archiva 1.2.2
+ Release Notes for Archiva 1.3
  -----
 
-Release Notes for Archiva 1.2.2
+Release Notes for Archiva 1.3
 
-  The Apache Archiva team would like to announce the release of Archiva 1.2.2.  Archiva is {{{http://archiva.apache.org/download.html}
+  The Apache Archiva team would like to announce the release of Archiva 1.3.  Archiva is {{{http://archiva.apache.org/download.html}
   available for download from the web site}}.
 
   Archiva is an application for managing one or more remote repositories, including administration, artifact handling, browsing and searching.
@@ -17,36 +17,138 @@
 
 * Compatibility Changes
 
-  * The Audit log filename has been renamed to <<<archiva-audit.log>>> instead of <<<audit.log>>> so that the log directory can be shared with other applications.
+  * 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.
 
-* New in Archiva 1.2
+* New in Archiva 1.3
 
-** Struts 2
+** Forced re-scan
 
-   The Archiva web application has been migrated from Webwork to Struts 2.
+   Sometimes it is necessary to force Archiva to rescan your repository, regardless of
+   file modification dates. There is now an option to do this directly from the
+   administration interface
 
-** Repository Statistics
+** Improved memory usage
 
-   Repository statistics are now available to help in monitoring the Archiva repositories. Statistics include the number of artifacts and size
-   of the repository, the number of plugins, jars, wars, etc. For more details about this feature, see {{{adminguide/reports.html}Reports}}.
+   Use of the indexing module has been thoroughly reviewed and some suboptimal memory
+   usage has been improved, requiring less memory for long running scan operations
+   (in turn improving performance).
 
-** Search
+** Audit logging of uploads
 
-   An advanced or filter search feature is added for more specific searching of artifacts. More details are available in {{{userguide/searching.html}Searching}}.
-   Archiva is also now using the Nexus index format for it's index.
+   Archiva's reporting user interface can now show audit information for artifacts
+   uploaded to repositories after the installation of Archiva 1.3.
 
-** Web Services
+* Release Notes
 
-   A web service for administrative tasks has been provided. It uses the Atlassian XML-RPC Binder which leverages the Apache XML-RPC.
-   For instructions on how to use this feature, see {{{adminguide/web-services.html}Using Archiva Web Services}}.
+  The Archiva 1.3 feature set can be seen in the {{{tour/index.html} feature tour}}.
 
-** Delete Artifact
+* Changes in Archiva 1.3
 
-   Artifacts can now be deleted from the web application. More details on how to use this feature is available in {{{userguide/delete-artifact.html}Deleting an Artifact}}.
+  Released: *13 Jan 2010*
 
-* Release Notes
+** Bug
+
+    * [MRM-612] - Repository scanning does not recognize newly added artifacts if they have an old timestamp
+
+    * [MRM-636] - war:inplace usage is not compatible with cobertura
+
+    * [MRM-747] - Archiva should prevent re-deployment of released or non-snapshot versioned artifacts
+
+    * [MRM-1033] - Changing the location of a scanned repository results to the contents of the new location not getting indexed
+
+    * [MRM-1228] - Ping service in not working
+
+    * [MRM-1229] - SearchService.quickSearch doesn't return the same result as the application
+
+    * [MRM-1230] - Type of artifact is allways "pom"
+
+    * [MRM-1231] -  Not authorized to use method with version parameter
+
+    * [MRM-1238] - NPE when updating consumers of known content without setting any of the checkboxes (enabled)
+
+    * [MRM-1240] - NPE when updating consumers (not setting any of the checkboxes) of Unprocessed Artifacts and Artifact Cleanup Scanning in Database
+
+    * [MRM-1243] - Encoding issues with Archiva UI: add Spring CharacterEncodingFilter
+
+    * [MRM-1246] - MetadataUpdaterConsumer didn't run during a repository scan after deleting a version of an artifact.
+
+    * [MRM-1249] - Archiva does not respect configuration of the index directory
+
+    * [MRM-1250] - Granting the Global Repository Manager/System Administrator role does not automatically assign the Global Repository Observer role
+
+    * [MRM-1253] - Artifacts cannot be found using the Search function
+
+    * [MRM-1259] - 'index-content' consumer processes all types of files, slowing down the indexing process
+
+    * [MRM-1265] - .indexer directory should not be scanned
+
+    * [MRM-1266] - results page fails when find artifact returns multiple results
+
+    * [MRM-1267] - Hide the sub-topics in documentation menu by default
+
+    * [MRM-1268] - X-Forwarded-Host handling when having more than one proxy
+
+    * [MRM-1272] - Empty Lucene Index
+
+    * [MRM-1274] - SearchService.quickSearch returns artifacts with null as repositoryId
+
+    * [MRM-1278] - Wrong repository displayed in Archiva browse
+
+    * [MRM-1290] - getDependees always returns results for archiva-test in xmlrpc
+
+    * [MRM-1294] - repository scan period is incorrect
+
+    * [MRM-1305] - Documentation for setting up archiva with tomcat 6 specifies invalid archiva.xml
+
+** Improvement
+
+    * [MRM-1056] - Option to force scanning of an artifact/repository regardless of file dates
+
+    * [MRM-1251] - Update documentation - Artifacts not displayed in Archiva GUI after release 
+
+    * [MRM-1262] - m2eclipse index should only be created at end of indexing run
+
+    * [MRM-1264] - reduce memory used by indexing process
+
+    * [MRM-1270] - Improve message when a user tries to search and the user does not have access to any repository
+
+    * [MRM-1275] - Include other file types for the index consumer instead of just the indexable-content
+
+** New Feature
+
+    * [MRM-1185] - Archiva Reporting Modification Request
+
+    * [MRM-1296] - Audit logging report
+
+** Task
+
+    * [MRM-1080] - Update SearchServiceImplTest so that it uses the new search API
+
+    * [MRM-1123] - ensure all nexus indexer dependencies are in central or built in to JAR appropriately
+
+    * [MRM-1164] - Fix the Selenium tests
+
+    * [MRM-1254] - Add more unit tests for searching artifacts
+
+    * [MRM-1277] - Create Selenium test for advanced search feature
+
+    * [MRM-1281] - remove unused consumers
+
+    * [MRM-1289] - need to document changes to wrapper.conf on upgrade
+
+    * [MRM-1306] - upgrade to jQuery UI 1.7.2 and jQuery 1.3.2
+
+    * [MRM-1309] - Upgrade to Redback 1.2.3
+
+** Test
+
+    * [MRM-1241] - Selenium Tests for Repository Scanning and Database
+
+    * [MRM-1257] - Selenium Test for accessing bundled repositories
 
-  The Archiva 1.2.2 feature set can be seen in the {{{tour/index.html} feature tour}}.
 
 * Changes in Archiva 1.2.2
 

Modified: archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/index.apt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/index.apt?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/index.apt (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/apt/userguide/index.apt Tue Jan 19 06:15:09 2010
@@ -20,6 +20,8 @@
     * {{{virtual-repositories.html} Configuring Virtual Repositories}}
 
     * {{{rss.html}RSS Feeds in Archiva}}
+    
+    * {{{auditlog-report.html}Viewing the Audit Log Report}}
 
     []
 

Modified: archiva/branches/MRM-1025/archiva-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/site.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/site.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/site.xml Tue Jan 19 06:15:09 2010
@@ -21,7 +21,7 @@
 <project>
   <body>
     <breadcrumbs>
-      <item name="1.2.2" href="/index.html" />
+      <item name="1.3" href="/index.html" />
     </breadcrumbs>
 
     <menu name="Introduction">
@@ -40,6 +40,7 @@
       <item name="Deploying to repository"   href="/userguide/deploy.html" />
       <item name="Configuring Virtual Repositories"   href="/userguide/virtual-repositories.html" />
       <item name="Rss Feeds in Archiva"      href="/userguide/rss.html"/>
+      <item name="Audit Log Report"      href="/userguide/auditlog-report.html"/>
     </menu>
 
     <menu name="Administrators Guide">

Modified: archiva/branches/MRM-1025/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-jetty/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-jetty/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-jetty/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
   <packaging>pom</packaging>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-artifact-converter</artifactId>
   <name>Archiva Artifact Converter</name>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
   <name>Archiva Checksum</name>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-consumer-api</artifactId>

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 Tue Jan 19 06:15:09 2010
@@ -2,4 +2,5 @@
 /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-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/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-891135
+/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

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-core-consumers</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-dependency-tree-consumer</artifactId>
   <name>Archiva Consumers :: Dependency Tree Consumer</name>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-lucene-consumers</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-consumers</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-metadata-consumer</artifactId>
   <name>Archiva Metadata Consumer</name>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml Tue Jan 19 06:15:09 2010
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-signature-consumers</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-consumers</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/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-891135*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/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-891135*
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-899477*

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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>