Merge origin/master Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d56c43d4 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d56c43d4 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d56c43d4
Branch: refs/heads/master Commit: d56c43d4df863645c928b460f106453a3f49d3c9 Parents: e451466 d9de8dc Author: Eric <Eric@Eric-PC> Authored: Thu Apr 10 04:15:00 2014 +0200 Committer: Eric <Eric@Eric-PC> Committed: Thu Apr 10 04:15:00 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/archiva/cli/ArchivaCli.java | 15 +++--- .../archiva/cli/ArtifactCountConsumer.java | 2 +- .../artifact/LegacyToDefaultConverter.java | 17 +------ .../artifact/LegacyToDefaultConverterTest.java | 2 +- .../archiva/checksum/ChecksummedFile.java | 6 +-- .../apache/archiva/checksum/ChecksumTest.java | 2 +- .../archiva/common/utils/VersionComparator.java | 4 +- .../common/utils/VersionComparatorTest.java | 6 +-- .../DefaultArchivaConfiguration.java | 8 ++-- .../apache/archiva/configuration/FileTypes.java | 2 +- ...nnectorConfigurationOrderComparatorTest.java | 6 +-- .../core/ArtifactMissingChecksumsConsumer.java | 2 +- .../consumers/core/AutoRemoveConsumer.java | 2 +- .../consumers/core/AutoRenameConsumer.java | 2 +- .../consumers/core/MetadataUpdaterConsumer.java | 2 +- .../core/ValidateChecksumConsumer.java | 4 +- ...CleanupReleasedSnapshotsRepositoryPurge.java | 2 +- .../core/repository/DaysOldRepositoryPurge.java | 2 +- .../repository/RepositoryPurgeConsumer.java | 14 +----- .../RetentionCountRepositoryPurge.java | 2 +- .../consumers/lucene/NexusIndexerConsumer.java | 2 +- .../ArchivaMetadataCreationConsumer.java | 12 +---- .../DefaultLegacyRepositoryConverter.java | 2 +- .../legacy/LegacyConverterArtifactConsumer.java | 2 +- .../converter/RepositoryConverterTest.java | 2 +- .../indexer/search/MavenRepositorySearch.java | 4 +- .../archiva/indexer/search/SearchFields.java | 2 +- .../archiva/indexer/search/SearchResultHit.java | 2 +- .../archiva/indexer/search/SearchResults.java | 2 +- .../search/MavenRepositorySearchTest.java | 50 ++++++++++---------- .../apache/archiva/maven2/model/TreeEntry.java | 2 +- .../archiva/model/ArchivaModelCloner.java | 4 +- .../archiva/policies/AbstractUpdatePolicy.java | 2 +- .../archiva/policies/CachedFailuresPolicy.java | 5 +- .../apache/archiva/policies/ChecksumPolicy.java | 2 +- .../policies/PropagateErrorsDownloadPolicy.java | 2 +- .../PropagateErrorsOnUpdateDownloadPolicy.java | 2 +- .../proxy/DefaultRepositoryProxyConnectors.java | 8 ++-- .../archiva/proxy/AbstractProxyTestCase.java | 6 +-- .../archiva/proxy/MetadataTransferTest.java | 6 +-- .../model/AbstractRepositoryConnector.java | 8 ++-- .../archiva/admin/model/beans/FileType.java | 2 +- .../admin/model/beans/LdapConfiguration.java | 2 +- .../admin/model/beans/ProxyConnectorRule.java | 2 +- .../beans/RedbackRuntimeConfiguration.java | 4 +- .../admin/model/beans/RemoteRepository.java | 4 +- .../admin/model/beans/RepositoryGroup.java | 2 +- .../repository/AbstractRepositoryAdmin.java | 3 +- .../admin/DefaultArchivaAdministration.java | 8 ++-- .../group/DefaultRepositoryGroupAdmin.java | 6 +-- .../managed/DefaultManagedRepositoryAdmin.java | 4 +- .../networkproxy/DefaultNetworkProxyAdmin.java | 2 +- .../DefaultProxyConnectorAdmin.java | 6 +-- .../DefaultProxyConnectorRuleAdmin.java | 10 ++-- .../remote/DefaultRemoteRepositoryAdmin.java | 9 ++-- ...DefaultRedbackRuntimeConfigurationAdmin.java | 14 +++--- .../archiva/admin/mock/MockAuditListener.java | 2 +- .../repository/metadata/MetadataTools.java | 16 +++---- .../metadata/RepositoryMetadataMerge.java | 2 +- .../scanner/DefaultRepositoryScanner.java | 6 +-- .../scanner/RepositoryContentConsumers.java | 10 ++-- .../repository/scanner/KnownScanConsumer.java | 2 +- .../scanner/RepositoryScannerTest.java | 42 ++++++++-------- .../archiva/test/utils/ListGenerator.java | 2 +- .../transaction/AbstractTransactionEvent.java | 10 ++-- .../archiva/transaction/FileTransaction.java | 2 +- .../DefaultRepositoryArchivaTaskScheduler.java | 4 +- .../archiva/mock/MockArchivaAdministration.java | 4 +- .../mock/MockManagedRepositoryAdmin.java | 2 +- .../TestRepositoryStatisticsManager.java | 2 +- .../archiva/rest/api/model/SearchRequest.java | 2 +- .../rest/services/AbstractRestService.java | 4 +- .../rest/services/DefaultBrowseService.java | 22 ++++----- .../DefaultMergeRepositoriesService.java | 2 +- .../rest/services/DefaultPluginsServices.java | 4 +- .../services/DefaultProxyConnectorService.java | 4 +- ...faultRedbackRuntimeConfigurationService.java | 10 ++-- .../DefaultReportRepositoriesService.java | 6 +-- .../services/DefaultRepositoriesService.java | 4 +- .../services/DefaultRepositoryGroupService.java | 8 ++-- .../rest/services/DefaultSearchService.java | 4 +- .../utils/AddAdminRepoConsumerClosure.java | 2 +- .../apache/archiva/rss/RssFeedGenerator.java | 2 +- .../processor/NewArtifactsRssFeedProcessor.java | 2 +- .../NewVersionsOfArtifactRssFeedProcessor.java | 4 +- .../archiva/rss/RssFeedGeneratorTest.java | 4 +- .../NewArtifactsRssFeedProcessorTest.java | 2 +- .../security/DefaultUserRepositories.java | 4 +- .../web/api/DefaultFileUploadService.java | 2 +- .../apache/archiva/web/rss/RssFeedServlet.java | 2 +- .../ArchivaConfigurableUsersManager.java | 12 ++--- .../ArchivaLdapRoleMapperConfiguration.java | 2 +- .../ArchivaLockedAdminEnvironmentCheck.java | 4 +- .../web/security/ArchivaRbacManager.java | 12 ++--- .../ArchivaUserManagerAuthenticator.java | 4 +- .../web/startup/SecuritySynchronization.java | 4 +- .../remotedownload/AbstractDownloadTest.java | 2 +- .../archiva/web/rss/SecuritySystemStub.java | 2 +- .../webtest/memory/TestMetadataRepository.java | 4 +- pom.xml | 5 +- 100 files changed, 254 insertions(+), 304 deletions(-) ----------------------------------------------------------------------
