maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ogusa...@apache.org
Subject svn commit: r769199 [1/19] - in /maven/mercury/trunk: mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/ mercury-core/src/main/java/org/apache/maven/mercury/artifact/ ...
Date Mon, 27 Apr 2009 23:12:32 GMT
Author: ogusakov
Date: Mon Apr 27 23:12:25 2009
New Revision: 769199

URL: http://svn.apache.org/viewvc?rev=769199&view=rev
Log:
- [MERCURY-118] - added reactor repository storage implementation to LocalRepositoryMap
- move messages to resources
- code format / organize imports

Added:
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/server/PlaceHolder.txt   (with props)
    maven/mercury/trunk/mercury-core/src/main/resources/org/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/artifact/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/artifact/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/artifact/version/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/artifact/version/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/crypto/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/crypto/pgp/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/crypto/pgp/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/pgp/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/event/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/event/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/metadata/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/metadata/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/metadata/sat/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/metadata/sat/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/api/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/api/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/cache/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/cache/fs/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/cache/fs/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/flat/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/flat/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/m2/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/m2/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/map/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/local/map/Messages.properties   (contents, props changed)
      - copied, changed from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/metadata/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/metadata/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/remote/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/remote/m2/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/virtual/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/repository/virtual/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/virtual/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/transport/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/transport/api/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/transport/api/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/transport/http/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/transport/http/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/http/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/util/
    maven/mercury/trunk/mercury-core/src/main/resources/org/apache/maven/mercury/util/Messages.properties   (props changed)
      - copied unchanged from r768764, maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/Messages.properties
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReactorMapTest.java   (with props)
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/a/
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/a/target/
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/a/target/a-1.0-SNAPSHOT.jar
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/a/target/a-1.0-SNAPSHOT.pom   (with props)
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/b/
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/b/target/
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/b/target/b-1.0-SNAPSHOT.jar
    maven/mercury/trunk/mercury-core/src/test/resources/repoReactor/b/target/b-1.0-SNAPSHOT.pom   (with props)
Removed:
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/pgp/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/virtual/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/http/Messages.properties
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/Messages.properties
Modified:
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusion.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusions.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusion.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusions.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/StringList.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Validation.java
    maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactCoordinates.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/MetadataTreeNode.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/QualityRange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/api/ConfigurationUtil.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ArtifactVersion.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersion.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/MavenVersionRange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionQuery.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/VersionRangeFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessorException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/builder/api/MetadataReaderException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/AbstractStreamVerifier.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/AbstractStreamVerifierFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamObserver.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamObserverException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamObserverFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifier.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierAttributes.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/api/StreamVerifierFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/basic/ChecksumCalculator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/cli/Sign.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpHelper.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifier.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha/SHA1Verifier.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha/SHA1VerifierFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/DumbListener.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventGenerator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventManager.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/GenericEvent.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ArtifactFilterList.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicDepthComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeDumper.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilterMap.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNodeGAVComparator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/DependencyConflictException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/HelpingSatSolver.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatOptimizer.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/MetadataResults.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/RepositoryGAMetadata.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdatePolicy.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdatePolicyFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAMetadata.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVMetadata.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/CachedMetadata.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/ArtifactLocation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlat.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlatFactory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2Factory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/DefaultStorage.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMap.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/ReactorStorage.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/Storage.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/local/map/StorageException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/AbstractOperand.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/AddPluginOperation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/AddVersionOperation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/MergeOperation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataBuilder.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/MetadataOperation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/metadata/SetSnapshotOperation.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2OperationException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2Factory.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryNonQualifiedArtifactException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/remote/m2/RepositoryUtilM2.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/HttpClientException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/HttpServletResponse.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/ObservableInputStream.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/ObservableOutputStream.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployRequest.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployResponse.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployResponse.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/RandomBatchIdGenerator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalResponse.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalCallback.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalResponse.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/AbstractTransport.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Initializable.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/InitializationException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/ReaderTransport.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/Server.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/ServerContainer.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/TransportException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/TransportTransaction.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/api/WriterTransport.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/http/HttpReaderTransport.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/transport/http/HttpWriterTransport.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/DefaultMonitor.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/FileLockBundle.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/FileUtil.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/FileUtilException.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/TimeUtil.java
    maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/util/Util.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/api/AbstractRepositoryTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/api/RepositoryUpdatePolicyIntervalTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGATest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/cache/fs/CachedGAVTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocationtest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryUtilM2Test.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/AuthenticatingJettyDeployerTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/AuthenticatingJettyRetrieverTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/ProxyJettyDeployerTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/ProxyJettyRetrieverTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/client/SecureJettyDeployerTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingPutServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilter.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/HttpTestServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/SecurePutServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/spi/http/server/StagingBatchFilter.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/util/FileUtilTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/util/NioTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/util/TimeUtilTest.java
    maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/util/UtilTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/MercuryPlexusLogger.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/MercuryPlexusLoggerFactory.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercuryException.java

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java Mon Apr 27 23:12:25 2009
@@ -41,7 +41,7 @@
 
     private static final String DEFAULT_AUTH_ID =
         System.getProperty( "mercury.default.auth.id", "mercury.default.auth.id." + System.currentTimeMillis() );
-    
+
     public static final String METHOD_BASIC = "basic";
 
     String _method;
@@ -51,11 +51,11 @@
     String _pass;
 
     String _certfile;
-    
+
     public Auth()
     {
     }
-    
+
     public Auth( String auth )
     {
         setSource( auth );
@@ -63,31 +63,31 @@
 
     public void setSource( String auth )
     {
-        if( auth == null )
+        if ( auth == null )
             throw new IllegalArgumentException( LANG.getMessage( "auth.null.auth" ) );
-        
+
         int colon = auth.indexOf( ':' );
-        
+
         String paramStr = null;
-        
-        if( colon == -1 )
+
+        if ( colon == -1 )
         {
             _method = METHOD_BASIC;
-            
+
             paramStr = auth;
         }
         else
-            paramStr = auth.substring( colon+1 );
-        
-        if( METHOD_BASIC.regionMatches( 0, _method, 0, METHOD_BASIC.length() ) )
+            paramStr = auth.substring( colon + 1 );
+
+        if ( METHOD_BASIC.regionMatches( 0, _method, 0, METHOD_BASIC.length() ) )
         {
             StringTokenizer st = new StringTokenizer( paramStr, "/" );
-            
-            if( st.countTokens() != 2 )
+
+            if ( st.countTokens() != 2 )
                 throw new IllegalArgumentException( LANG.getMessage( "auth.bad.basic.params" ) );
-            
+
             _name = st.nextToken();
-            
+
             _pass = st.nextToken();
         }
     }

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Mon Apr 27 23:12:25 2009
@@ -53,22 +53,22 @@
 
     public static final String DEFAULT_CONFIG_ID =
         System.getProperty( "mercury.default.config.id", "mercury.default.config.id." + System.currentTimeMillis() );
-    
+
     public static final String USER_HOME = System.getProperty( "user.home" );
-    
+
     public static final String DEFAULT_PUBLIC_KEYRING = USER_HOME + "/.gnupg/pubring.gpg";
-    
+
     public static final String DEFAULT_SECRET_KEYRING = USER_HOME + "/.gnupg/secring.gpg";
-    
+
     private Collection<Repo> _repos;
 
     private Collection<Auth> _auths;
 
     private List<Repository> _repositories;
-    
+
     private Validation _validation = new Validation();
-    
-    //------------------------------------------------------------------------------
+
+    // ------------------------------------------------------------------------------
     public Config()
     {
     }
@@ -76,24 +76,23 @@
     private Config( String localDir, String remoteUrl )
     {
         createDefaultLocalRepo( localDir );
-        
+
         createDefaultRemoteRepo( remoteUrl );
     }
-    
+
     private Repo createDefaultRemoteRepo( String remoteUrl )
     {
         Repo central = createRepo();
         central.setId( "central" );
 
         String centralUrl =
-            ( remoteUrl == null ) ? System.getProperty( SYSTEM_PROPERTY_CENTRAL_URL, DEFAULT_CENTRAL_URL )
-                            : remoteUrl;
+            ( remoteUrl == null ) ? System.getProperty( SYSTEM_PROPERTY_CENTRAL_URL, DEFAULT_CENTRAL_URL ) : remoteUrl;
 
         central.setUrl( centralUrl );
-        
+
         return central;
     }
-    
+
     private Repo createDefaultLocalRepo( String localDir )
     {
         Repo local = createRepo();
@@ -104,7 +103,7 @@
                 + DEFAULT_LOCAL_DIR_NAME ) : localDir;
 
         local.setDir( localDirName );
-        
+
         return local;
     }
 
@@ -118,22 +117,22 @@
 
         if ( Util.isEmpty( _repos ) )
         {
-            _repos = new ArrayList<Repo>(3);
+            _repos = new ArrayList<Repo>( 3 );
         }
-        
+
         boolean localExists = false;
         boolean remoteExists = false;
-        
-        for( Repo r : _repos )
-            if( r.isLocal() )
+
+        for ( Repo r : _repos )
+            if ( r.isLocal() )
                 localExists = true;
             else
                 remoteExists = true;
-        
-        if( ! localExists )
+
+        if ( !localExists )
             createDefaultLocalRepo( null );
-        
-        if( !remoteExists)
+
+        if ( !remoteExists )
             createDefaultRemoteRepo( null );
 
         _repositories = new ArrayList<Repository>( _repos.size() );

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Mon Apr 27 23:12:25 2009
@@ -80,9 +80,9 @@
     private Storage _pomStorage;
 
     private Dependency _sourceDependency;
-    
+
     List<String> _inclusions;
-    
+
     List<String> _exclusions;
 
     private List<ArtifactMetadata> getDependencies( VirtualRepositoryReader vr )
@@ -120,7 +120,7 @@
                 try
                 {
                     _pomStorage.add( key, pomFile );
-                    
+
                     d._amd.setTracker( _pomRepo.getReader() );
 
                     deps = vr.readDependencies( d._amd );
@@ -195,21 +195,20 @@
         repos.add( 0, _pomRepo );
 
         VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
-        
+
         _pomRepo.setMetadataReader( vr );
 
         List<ArtifactMetadata> depList = getDependencies( vr );
-        
+
         ArtifactQueryList aql = new ArtifactQueryList( depList );
-        
+
         ArtifactInclusionList ail = getInclusions();
-        
+
         ArtifactExclusionList ael = getExclusions();
 
         List<ArtifactMetadata> res =
-            _transitive ? db.resolveConflicts( scope, aql, ail, ael )
-                            : toArtifactMetadataList( depList );
-            
+            _transitive ? db.resolveConflicts( scope, aql, ail, ael ) : toArtifactMetadataList( depList );
+
         db.close();
 
         if ( Util.isEmpty( res ) )
@@ -231,9 +230,9 @@
 
         if ( !aRes.hasResults() )
         {
-            if( aRes.hasExceptions() )
+            if ( aRes.hasExceptions() )
                 throw new Exception( LANG.getMessage( "vr.error", aRes.getExceptions().toString() ) );
-            
+
             return null;
         }
 
@@ -274,18 +273,18 @@
 
     private ArtifactExclusionList getExclusions()
     {
-        if( Util.isEmpty( _exclusions ) )
+        if ( Util.isEmpty( _exclusions ) )
             return null;
-        
-        return new ArtifactExclusionList( _exclusions.toArray( new String [_exclusions.size()] ) );
+
+        return new ArtifactExclusionList( _exclusions.toArray( new String[_exclusions.size()] ) );
     }
 
     private ArtifactInclusionList getInclusions()
     {
-        if( Util.isEmpty( _inclusions ) )
+        if ( Util.isEmpty( _inclusions ) )
             return null;
-        
-        return new ArtifactInclusionList( _inclusions.toArray( new String [_inclusions.size()] ) );
+
+        return new ArtifactInclusionList( _inclusions.toArray( new String[_inclusions.size()] ) );
     }
 
     /**
@@ -316,19 +315,19 @@
         this._scope = scope;
     }
 
-//    @Override
-//    public void setId( String id )
-//    {
-//        super.setId( id );
-//
-//        if ( _sourceDependency != null )
-//            _sourceDependency.setId( id );
-//    }
+    // @Override
+    // public void setId( String id )
+    // {
+    // super.setId( id );
+    //
+    // if ( _sourceDependency != null )
+    // _sourceDependency.setId( id );
+    // }
 
     public void setSource( String pom )
     {
         _sourceDependency = createDependency();
-        
+
         _sourceDependency.setSource( pom );
     }
 
@@ -336,12 +335,12 @@
     {
         this._transitive = val;
     }
-    
+
     public void addConfiguredExclusions( Exclusions ex )
     {
         _exclusions = ex._list;
     }
-    
+
     public void addConfiguredInclusions( Inclusions in )
     {
         _inclusions = in._list;
@@ -354,7 +353,7 @@
 
     protected void setExclusions( List<String> exList )
     {
-        if( _exclusions == null )
+        if ( _exclusions == null )
             _exclusions = exList;
         else
             _exclusions.addAll( exList );
@@ -362,7 +361,7 @@
 
     protected void setInclusions( List<String> inList )
     {
-        if( _inclusions == null )
+        if ( _inclusions == null )
             _inclusions = inList;
         else
             _inclusions.addAll( inList );

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java Mon Apr 27 23:12:25 2009
@@ -45,53 +45,53 @@
 
     /** dependency processor type, if any */
     protected String _processor;
-    
+
     protected List<String> _inclusions;
-    
+
     protected List<String> _exclusions;
-    
+
     private static long _count = 0L;
-    
+
     public ArtifactMetadata getMetadata()
     {
         _amd.setInclusions( getInclusions() );
-        
+
         _amd.setExclusions( getExclusions() );
-        
+
         return _amd;
     }
-    
+
     private Collection<ArtifactMetadata> getExclusions()
     {
-        if( Util.isEmpty( _exclusions ))
+        if ( Util.isEmpty( _exclusions ) )
             return null;
-        
+
         List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( _exclusions.size() );
-        
-        for( String name : _exclusions )
-            res.add( new ArtifactMetadata(name) );
-        
+
+        for ( String name : _exclusions )
+            res.add( new ArtifactMetadata( name ) );
+
         return res;
     }
 
     private Collection<ArtifactMetadata> getInclusions()
     {
-        if( Util.isEmpty( _inclusions ))
+        if ( Util.isEmpty( _inclusions ) )
             return null;
-        
+
         List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( _inclusions.size() );
-        
-        for( String name : _inclusions )
-            res.add( new ArtifactMetadata(name) );
-        
+
+        for ( String name : _inclusions )
+            res.add( new ArtifactMetadata( name ) );
+
         return res;
     }
 
     public void setName( String name )
     {
-        if( _pom != null )
+        if ( _pom != null )
             throw new IllegalArgumentException( LANG.getMessage( "dependency.amd.pom.exists", _pom, name ) );
-        
+
         _amd = new ArtifactMetadata( name );
 
         _amd.setOptional( _optional );
@@ -114,11 +114,11 @@
 
     public void setPom( String pom )
     {
-        if( _amd != null )
+        if ( _amd != null )
             throw new IllegalArgumentException( LANG.getMessage( "dependency.pom.amd.exists", _amd.toString(), pom ) );
 
-        setId( "__ant_fake:_ant_fake:" + (_count++)+"::pom" );
-        
+        setId( "__ant_fake:_ant_fake:" + ( _count++ ) + "::pom" );
+
         int pos = pom.indexOf( ':' );
 
         if ( pos != -1 )
@@ -176,12 +176,12 @@
 
         _amd.setVersion( version );
     }
-    
+
     public void addConfiguredExclusions( Exclusions ex )
     {
         _exclusions = ex._list;
     }
-    
+
     public void addConfiguredInclusions( Inclusions in )
     {
         _inclusions = in._list;

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusion.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusion.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusion.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusion.java Mon Apr 27 23:12:25 2009
@@ -15,27 +15,24 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 
 public class Exclusion
 {
     String _name;
-    
+
     public void setId( String val )
     {
         _name = val;
     }
-    
+
     public void setName( String val )
     {
         _name = val;

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusions.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusions.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusions.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Exclusions.java Mon Apr 27 23:12:25 2009
@@ -15,18 +15,15 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
 import java.util.List;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 public class Exclusions
     extends StringList
@@ -35,7 +32,7 @@
     {
         return _list;
     }
-    
+
     public void addConfiguredExclusion( Exclusion ex )
     {
         addString( ex._name );

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusion.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusion.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusion.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusion.java Mon Apr 27 23:12:25 2009
@@ -15,27 +15,24 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 
 class Inclusion
 {
     String _name;
-    
+
     public void setId( String val )
     {
         _name = val;
     }
-    
+
     public void setName( String val )
     {
         _name = val;

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusions.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusions.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusions.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Inclusions.java Mon Apr 27 23:12:25 2009
@@ -15,18 +15,15 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
 import java.util.List;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 public class Inclusions
     extends StringList
@@ -35,7 +32,7 @@
     {
         return _list;
     }
-    
+
     public void addConfiguredExclusion( Inclusion ex )
     {
         addString( ex._name );

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java Mon Apr 27 23:12:25 2009
@@ -96,9 +96,8 @@
     private transient boolean _registered = false;
 
     private static final String[] SUPPORTED_LAYOUTS = new String[] { DEFAULT_LAYOUT, "m2", "flat" };
-    
+
     private Validation _validation;
-    
 
     public Repo()
     {
@@ -107,7 +106,7 @@
     public Repo( boolean managed, Validation validation )
     {
         _managed = managed;
-        
+
         _validation = validation;
     }
 
@@ -149,7 +148,7 @@
 
         processDefaults();
     }
-    
+
     public void setSnapshots( boolean snapshots )
     {
         this._snapshots = snapshots;
@@ -203,18 +202,18 @@
             setUrl( path );
         }
     }
-    
+
     public void setAuthentication( String auth )
     {
         Auth a = new Auth( auth );
-        
-        String authId = "auth."+System.currentTimeMillis()+"." + (int)(Math.random()*10000);
-        
+
+        String authId = "auth." + System.currentTimeMillis() + "." + (int) ( Math.random() * 10000 );
+
         getProject().addReference( authId, a );
-        
+
         setAuthid( authId );
     }
-    
+
     public void setAuthid( String authid )
     {
         this._authid = authid;
@@ -256,7 +255,7 @@
 
         processDefaults();
     }
-    
+
     public void setUpdatePolicy( String updatePolicy )
     {
         this._updatePolicy = updatePolicy;
@@ -269,33 +268,33 @@
         return ( _dir != null );
     }
 
-//    public Verify createVerifywrite()
-//    {
-//        if ( _writeVerifiers == null )
-//        {
-//            _writeVerifiers = new ArrayList<Verify>( 2 );
-//        }
-//
-//        Verify v = new Verify();
-//
-//        _writeVerifiers.add( v );
-//
-//        return v;
-//    }
-
-//    public Verify createVerifyread()
-//    {
-//        if ( _readVerifiers == null )
-//        {
-//            _readVerifiers = new ArrayList<Verify>( 2 );
-//        }
-//
-//        Verify v = new Verify();
-//
-//        _readVerifiers.add( v );
-//
-//        return v;
-//    }
+    // public Verify createVerifywrite()
+    // {
+    // if ( _writeVerifiers == null )
+    // {
+    // _writeVerifiers = new ArrayList<Verify>( 2 );
+    // }
+    //
+    // Verify v = new Verify();
+    //
+    // _writeVerifiers.add( v );
+    //
+    // return v;
+    // }
+
+    // public Verify createVerifyread()
+    // {
+    // if ( _readVerifiers == null )
+    // {
+    // _readVerifiers = new ArrayList<Verify>( 2 );
+    // }
+    //
+    // Verify v = new Verify();
+    //
+    // _readVerifiers.add( v );
+    //
+    // return v;
+    // }
 
     private Set<StreamVerifierFactory> getVerifiers( List<Verify> vlist )
     {
@@ -318,15 +317,15 @@
     public Repository getRepository()
     {
         Repository r = null;
-        
+
         updateReadVerifiers( _validation );
-        
+
         updateWriteVerifiers( _validation );
-        
+
         String id = getId();
-        
-        if( id == null )
-            setId( "temp."+System.currentTimeMillis()+"." + (int)( Math.random()*10000. ) );
+
+        if ( id == null )
+            setId( "temp." + System.currentTimeMillis() + "." + (int) ( Math.random() * 10000. ) );
 
         if ( isLocal() )
         {
@@ -339,7 +338,7 @@
 
                 server.setReaderStreamVerifierFactories( getVerifiers( _readVerifiers ) );
                 server.setWriterStreamVerifierFactories( getVerifiers( _writeVerifiers ) );
-                    
+
             }
             catch ( MalformedURLException e )
             {
@@ -347,9 +346,9 @@
             }
 
             r = new LocalRepositoryM2( server, dp );
-            
+
             QualityRange qr = QualityRange.create( _releases, _snapshots );
-            
+
             r.setRepositoryQualityRange( qr );
         }
         else
@@ -416,14 +415,14 @@
             }
 
             r = new RemoteRepositoryM2( server, dp );
-            
+
             _updatePolicy = System.getProperty( RepositoryUpdatePolicy.SYSTEM_PROPERTY_UPDATE_POLICY, _updatePolicy );
-            
-            if( !Util.isEmpty( _updatePolicy) )
-                ((RemoteRepositoryM2)r).setUpdatePolicy( RepositoryUpdatePolicyFactory.create( _updatePolicy ) );
-            
+
+            if ( !Util.isEmpty( _updatePolicy ) )
+                ( (RemoteRepositoryM2) r ).setUpdatePolicy( RepositoryUpdatePolicyFactory.create( _updatePolicy ) );
+
             QualityRange qr = QualityRange.create( _releases, _snapshots );
-            
+
             r.setRepositoryQualityRange( qr );
         }
 
@@ -435,33 +434,26 @@
      */
     private void updateReadVerifiers( Validation validation )
     {
-        if( validation == null 
-            ||
-            (
-              validation._sha1Validation == false
-              && 
-              validation._pgpValidation == false
-            ) 
-        )
+        if ( validation == null || ( validation._sha1Validation == false && validation._pgpValidation == false ) )
             return;
 
-        if( _readVerifiers == null )
-            _readVerifiers = new ArrayList<Verify>(2);
-        
-        if( validation._sha1Validation )
+        if ( _readVerifiers == null )
+            _readVerifiers = new ArrayList<Verify>( 2 );
+
+        if ( validation._sha1Validation )
         {
             Verify v = new Verify( Validation.TYPE_SHA1 );
-            
+
             _readVerifiers.add( v );
         }
-        
-        if( validation._pgpValidation )
+
+        if ( validation._pgpValidation )
         {
-            Verify v = new Verify( Validation.TYPE_PGP, prop("keyring", validation._pgpPublicKeyring ) );
-            
+            Verify v = new Verify( Validation.TYPE_PGP, prop( "keyring", validation._pgpPublicKeyring ) );
+
             _readVerifiers.add( v );
         }
-            
+
     }
 
     /**
@@ -469,37 +461,29 @@
      */
     private void updateWriteVerifiers( Validation validation )
     {
-        if( validation == null 
-            ||
-            (
-            validation._sha1Signature == false
-            &&
-            Util.isEmpty( validation._pgpSecretKeyPass ) 
-            ) 
-        )
+        if ( validation == null
+            || ( validation._sha1Signature == false && Util.isEmpty( validation._pgpSecretKeyPass ) ) )
             return;
 
-        if( _writeVerifiers == null )
-            _writeVerifiers = new ArrayList<Verify>(2);
-        
-        if( validation._sha1Signature )
+        if ( _writeVerifiers == null )
+            _writeVerifiers = new ArrayList<Verify>( 2 );
+
+        if ( validation._sha1Signature )
         {
             Verify v = new Verify( Validation.TYPE_SHA1 );
-            
+
             _writeVerifiers.add( v );
         }
-        
-        if( ! Util.isEmpty( validation._pgpSecretKeyPass ) )
+
+        if ( !Util.isEmpty( validation._pgpSecretKeyPass ) )
         {
-            Verify v = new Verify( Validation.TYPE_PGP
-                                   , prop( "keyring", validation._pgpSecretKeyring )
-                                   , prop( "pass",    validation._pgpSecretKeyPass )
-                                   , prop( "key",     validation._pgpSecretKey )
-                                 );
-            
+            Verify v =
+                new Verify( Validation.TYPE_PGP, prop( "keyring", validation._pgpSecretKeyring ),
+                            prop( "pass", validation._pgpSecretKeyPass ), prop( "key", validation._pgpSecretKey ) );
+
             _writeVerifiers.add( v );
         }
-            
+
     }
 
     public Auth createAuth()
@@ -530,15 +514,15 @@
     {
         return createProxyauth();
     }
-    
+
     public static final Property prop( String name, String val )
     {
         Property prop = new Property();
-        
+
         prop.setName( name );
-        
+
         prop.setValue( val );
-        
+
         return prop;
     }
 
@@ -552,13 +536,13 @@
         boolean _sufficient = false;
 
         Map<String, String> _properties;
-        
+
         public Verify( String type, Property... properties )
         {
             setType( type );
-            
-            if( properties != null )
-                for( Property p : properties )
+
+            if ( properties != null )
+                for ( Property p : properties )
                     addConfiguredProperty( p );
         }
 
@@ -606,7 +590,7 @@
             if ( Validation.TYPE_PGP.equals( _type ) )
             {
 
-                if ( Util.isEmpty(  _properties ) )
+                if ( Util.isEmpty( _properties ) )
                 {
                     throw new BuildException( LANG.getMessage( "config.repo.verifier.no.properties", _type ) );
                 }

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Mon Apr 27 23:12:25 2009
@@ -60,7 +60,7 @@
 
     private boolean _hasPathId = false;
 
-//    private String _refPathId;
+    // private String _refPathId;
 
     private String _configId;
 
@@ -73,11 +73,11 @@
     private List<Dependency> _dependencies;
 
     private Dependency _sourceDependency;
-    
+
     List<String> _inclusions;
-    
+
     List<String> _exclusions;
-    
+
     // ----------------------------------------------------------------------------------------
     @Override
     public String getDescription()
@@ -139,16 +139,16 @@
                 return;
             }
         }
-//        else if ( !Util.isEmpty( _refPathId ) )
-//        {
-//            Object p = getProject().getReference( _refPathId );
-//
-//            if ( p == null )
-//            {
-//                throwIfEnabled( LANG.getMessage( "no.path.ref", _refPathId ) );
-//                return;
-//            }
-//        }
+        // else if ( !Util.isEmpty( _refPathId ) )
+        // {
+        // Object p = getProject().getReference( _refPathId );
+        //
+        // if ( p == null )
+        // {
+        // throwIfEnabled( LANG.getMessage( "no.path.ref", _refPathId ) );
+        // return;
+        // }
+        // }
         else
         {
             _pathId = Config.DEFAULT_PATH_ID;
@@ -157,17 +157,18 @@
         try
         {
             Config config = AbstractAntTask.findConfig( getProject(), _configId );
-            
-if( LOG.isDebugEnabled() )
-{
-    for( Repository r : config.getRepositories() )
-        LOG.debug( "Repository: " + (r.getServer() == null ? r.getClass().getName() : r.getServer().getURL()) );
-}
+
+            if ( LOG.isDebugEnabled() )
+            {
+                for ( Repository r : config.getRepositories() )
+                    LOG.debug( "Repository: "
+                        + ( r.getServer() == null ? r.getClass().getName() : r.getServer().getURL() ) );
+            }
 
             dep.setTransitive( _transitive );
-            
+
             dep.setInclusions( _inclusions );
-            
+
             dep.setExclusions( _exclusions );
 
             ArtifactScopeEnum[] scopes = _scope == null ? SCOPES : new ArtifactScopeEnum[] { _scope };
@@ -181,15 +182,15 @@
                     continue;
                 }
 
-                if( _hasPathId && _scope != null )
+                if ( _hasPathId && _scope != null )
                 {
-                    createPath( _pathId, _pathId+".fileset", artifacts );
+                    createPath( _pathId, _pathId + ".fileset", artifacts );
                     continue;
                 }
 
                 if ( ArtifactScopeEnum.compile.equals( sc ) )
                 {
-                    createPath( _pathId, _pathId+".fileset", artifacts );
+                    createPath( _pathId, _pathId + ".fileset", artifacts );
                 }
 
                 createPath( _pathId + "." + sc.getScope(), _pathId + ".fileset." + sc.getScope(), artifacts );
@@ -205,10 +206,10 @@
     private File findRoot( File f )
     {
         File root = f;
-        
-        while( root.getParentFile() != null )
+
+        while ( root.getParentFile() != null )
             root = root.getParentFile();
-        
+
         return root;
     }
 
@@ -240,7 +241,7 @@
         {
             if ( dir == null )
                 dir = findRoot( a.getFile() );
-                
+
             String aPath = a.getFile().getCanonicalPath();
 
             FileList.FileName fn = new FileList.FileName();
@@ -248,20 +249,19 @@
             fn.setName( aPath );
 
             pathFileList.addConfiguredFile( fn );
-            
+
         }
 
         pathFileList.setDir( dir );
-        
-        
+
         // fileset is trickier as it wants a dir
         fSet.setDir( dir );
-        
-        String dirName = dir.getCanonicalPath(); 
-        
+
+        String dirName = dir.getCanonicalPath();
+
         int dirLen = dirName.length();
-        
-        for( String fn : pathFileList.getFiles( getProject() ) )
+
+        for ( String fn : pathFileList.getFiles( getProject() ) )
         {
             fSet.createInclude().setName( fn.substring( dirLen ) );
         }
@@ -302,24 +302,24 @@
     public void setPathId( String pathId )
     {
         this._pathId = pathId;
-        
+
         _hasPathId = true;
     }
 
-//    public void setRefpathid( String refPathId )
-//    {
-//        this._refPathId = refPathId;
-//    }
-//
-//    public void setRefpathId( String refPathId )
-//    {
-//        this._refPathId = refPathId;
-//    }
-//
-//    public void setRefPathId( String refPathId )
-//    {
-//        this._refPathId = refPathId;
-//    }
+    // public void setRefpathid( String refPathId )
+    // {
+    // this._refPathId = refPathId;
+    // }
+    //
+    // public void setRefpathId( String refPathId )
+    // {
+    // this._refPathId = refPathId;
+    // }
+    //
+    // public void setRefPathId( String refPathId )
+    // {
+    // this._refPathId = refPathId;
+    // }
 
     public void setDepid( String depid )
     {
@@ -371,12 +371,12 @@
 
         return dependency;
     }
-    
+
     public void addConfiguredExclusions( Exclusions ex )
     {
         _exclusions = ex._list;
     }
-    
+
     public void addConfiguredInclusions( Inclusions in )
     {
         _inclusions = in._list;

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/StringList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/StringList.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/StringList.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/StringList.java Mon Apr 27 23:12:25 2009
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
@@ -23,22 +23,19 @@
 import java.util.List;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 public abstract class StringList
     extends AbstractDataType
 {
     List<String> _list;
-    
+
     protected void addString( String str )
     {
-        if( _list == null )
-            _list = new ArrayList<String>(8);
-        
+        if ( _list == null )
+            _list = new ArrayList<String>( 8 );
+
         _list.add( str );
     }
 

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Validation.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Validation.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Validation.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Validation.java Mon Apr 27 23:12:25 2009
@@ -15,42 +15,39 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*/
+ */
 
 package org.apache.maven.mercury.ant.tasks;
 
 /**
- *
- *
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 public class Validation
 {
     public static final String TYPE_PGP = "pgp";
 
     public static final String TYPE_SHA1 = "sha1";
-    
+
     public static final String PROP_PUBLIC_KEYRING = "keyring";
-    
+
     public static final String PROP_SECRET_KEYRING = "secret-keyring";
-    
+
     public static final String PROP_SECRET_KEY_ID = "secret-keyring";
-    
+
     public static final String PROP_SECRET_KEY_PASS = "secret-keyring";
 
     protected boolean _pgpValidation = false;
-    
+
     protected String _pgpPublicKeyring = Config.DEFAULT_PUBLIC_KEYRING;
-    
+
     protected String _pgpSecretKeyring = Config.DEFAULT_SECRET_KEYRING;
-    
+
     protected String _pgpSecretKey;
-    
+
     protected String _pgpSecretKeyPass;
-    
+
     protected boolean _sha1Validation = false;
-    
-    protected boolean _sha1Signature  = true;
+
+    protected boolean _sha1Signature = true;
 }

Modified: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java Mon Apr 27 23:12:25 2009
@@ -54,7 +54,7 @@
     File _testCopyDir;
 
     File _testCopyRuntimeDir;
-    
+
     AuthenticatingTestServer _jetty;
 
     int _port;
@@ -75,11 +75,11 @@
         _localRepoDirFile = new File( _localRepoDir );
         FileUtil.delete( _localRepoDirFile );
         _localRepoDirFile.mkdirs();
-        
+
         _testCopyDir = new File( "target/test-copy" );
         FileUtil.delete( _testCopyDir );
         _testCopyDir.mkdirs();
-        
+
         _testCopyRuntimeDir = new File( "target/test-copy-runtime" );
         FileUtil.delete( _testCopyRuntimeDir );
         _testCopyRuntimeDir.mkdirs();
@@ -174,7 +174,7 @@
 
     // -----------------------------------
     public void testDownloadPomNonTransitive()
-    throws IOException
+        throws IOException
     {
         String title = "download-pom-non-transtive";
         System.out.println( "========> start " + title );
@@ -193,7 +193,7 @@
         File tc0 = new File( _testCopyDir, "a0-v0.jar" );
         File tc1 = new File( _testCopyDir, "a1-v1.jar" );
         File tc2 = new File( _testCopyDir, "a2-v2.jar" );
-        
+
         assertFalse( tc0.exists() );
         assertFalse( tc1.exists() );
         assertFalse( tc2.exists() );
@@ -202,36 +202,37 @@
         File tcr0 = new File( _testCopyRuntimeDir, "a0-v0.jar" );
         File tcr1 = new File( _testCopyRuntimeDir, "a1-v1.jar" );
         File tcr2 = new File( _testCopyRuntimeDir, "a2-v2.jar" );
-        
+
         assertFalse( tcr0.exists() );
         assertFalse( tcr1.exists() );
         assertFalse( tcr2.exists() );
-        
+
         executeTarget( title );
 
         assertTrue( a0.exists() );
         assertTrue( a1.exists() );
         assertFalse( a2.exists() );
-        
+
         String cp = getProject().getProperty( "cp" );
-        
-//        System.out.println( "cp = " + cp );
-        
+
+        // System.out.println( "cp = " + cp );
+
         // mercury.classpath
         assertTrue( cp.indexOf( a0.getCanonicalPath() ) != -1 );
         assertTrue( cp.indexOf( a1.getCanonicalPath() ) != -1 );
         assertTrue( cp.indexOf( a2.getCanonicalPath() ) == -1 );
-        
+
         // mercury.fileset
         assertTrue( tc0.exists() );
         assertTrue( tc1.exists() );
         assertFalse( tc2.exists() );
-        
+
         // mercury.fileset.runtime
         assertTrue( tcr0.exists() );
         assertTrue( tcr1.exists() );
         assertFalse( tcr2.exists() );
     }
+
     // -----------------------------------
     public void testExclusions()
     {
@@ -255,13 +256,13 @@
 
         String cp = getProject().getProperty( "cp" );
         assertNotNull( cp );
-        
+
         // mercury.classpath
         assertTrue( cp.indexOf( "a0" ) != -1 );
         assertTrue( cp.indexOf( "a1" ) != -1 );
         assertTrue( cp.indexOf( "a2" ) == -1 );
-        
-//        System.out.println( "cp = " + cp );
+
+        // System.out.println( "cp = " + cp );
     }
 
     // -----------------------------------
@@ -280,12 +281,12 @@
         assertFalse( a2.exists() );
 
         executeTarget( title );
-        
+
         // TODO: prep. the test data to test pgp sigs
-//
-//        assertTrue( a0.exists() );
-//        assertTrue( a1.exists() );
-//        assertTrue( a2.exists() );
+        //
+        // assertTrue( a0.exists() );
+        // assertTrue( a1.exists() );
+        // assertTrue( a2.exists() );
     }
     // -----------------------------------
     // -----------------------------------

Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Artifact.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Artifact.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/Artifact.java Mon Apr 27 23:12:25 2009
@@ -20,16 +20,14 @@
 import java.util.regex.Pattern;
 
 /**
- * TODO: Oleg: don't know if this should be interface or class, so there is a little disparate:
- *  ArtifactMetadata is a class, Artifact is an interface. Will clear out  
- *
- *
+ * TODO: Oleg: don't know if this should be interface or class, so there is a little disparate: ArtifactMetadata is a
+ * class, Artifact is an interface. Will clear out
+ * 
  * @author Oleg Gusakov
  * @version $Id$
- *
  */
 public interface Artifact
-extends Comparable<Artifact>
+    extends Comparable<Artifact>
 {
     static final String LATEST_VERSION = "LATEST";
 
@@ -37,7 +35,7 @@
 
     static final String RELEASE_VERSION = "RELEASE";
 
-    static final String  SNAPSHOT_TS_REGEX = ".+-\\d{8}\\.\\d{6}-\\d+";
+    static final String SNAPSHOT_TS_REGEX = ".+-\\d{8}\\.\\d{6}-\\d+";
 
     static final Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
 
@@ -62,10 +60,10 @@
     void setVersion( String version );
 
     /**
-     * Get the artifactScope of the artifact. If the artifact is a standalone rather than a dependency, it's artifactScope will be
-     * <code>null</code>. The artifactScope may not be the same as it was declared on the original dependency, as this is the
-     * result of combining it with the main project artifactScope.
-     *
+     * Get the artifactScope of the artifact. If the artifact is a standalone rather than a dependency, it's
+     * artifactScope will be <code>null</code>. The artifactScope may not be the same as it was declared on the original
+     * dependency, as this is the result of combining it with the main project artifactScope.
+     * 
      * @return the artifactScope
      */
     String getScope();
@@ -78,18 +76,18 @@
     boolean hasClassifier();
 
     File getFile();
-    
+
     // in case binary is supplied as a Stream, not a File
     InputStream getStream();
 
     void setFile( File destination );
-    
-    byte [] getPomBlob();
-    
-    void setPomBlob( byte [] pomBlob );
-    
+
+    byte[] getPomBlob();
+
+    void setPomBlob( byte[] pomBlob );
+
     String getBaseName();
-    
+
     String getBaseName( String classifier );
 
     // ----------------------------------------------------------------------

Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactCoordinates.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactCoordinates.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactCoordinates.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactCoordinates.java Mon Apr 27 23:12:25 2009
@@ -85,7 +85,7 @@
     {
         this.version = version;
     }
-    
+
     public String getClassifier()
     {
         return classifier;

Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java Mon Apr 27 23:12:25 2009
@@ -35,7 +35,7 @@
 /**
  * this is the most primitive metadata there is, usually used to query repository for "real" metadata. It holds
  * everything a project.dependencies.dependency element can have
- *
+ * 
  * @author Oleg Gusakov
  * @version $Id$
  */
@@ -45,7 +45,6 @@
 
     private static final Language LANG = new DefaultLanguage( ArtifactMetadata.class );
 
-
     /**
      * standard glorified artifact coordinates
      */
@@ -82,7 +81,7 @@
     protected Collection<ArtifactMetadata> exclusions;
 
     protected Map<String, String> attributes;
-    
+
     /** conveniency for SNAPSHOT file timestamp */
     private String timeStamp;
 
@@ -97,7 +96,7 @@
      * transient external datum to carry along
      */
     transient Object datum;
-    
+
     /** dependencies of the artifact behind this metadata */
     protected List<ArtifactMetadata> dependencies;
 
@@ -237,7 +236,7 @@
             processAttributes( nullify( tokens[6] ) );
         }
     }
-    
+
     /**
      * copy constructor
      * 
@@ -245,26 +244,26 @@
      */
     public ArtifactMetadata( ArtifactMetadata copyFrom )
     {
-        if( copyFrom == null )
-            throw new IllegalArgumentException( LANG.getMessage( "null.copy.from.md") );
+        if ( copyFrom == null )
+            throw new IllegalArgumentException( LANG.getMessage( "null.copy.from.md" ) );
+
+        setGroupId( copyFrom.getGroupId() );
+        setArtifactId( copyFrom.getArtifactId() );
+        setVersion( copyFrom.getVersion() );
+        setClassifier( copyFrom.getClassifier() );
+        setType( copyFrom.getType() );
+        setScope( copyFrom.getScope() );
+
+        Map<String, String> a = copyFrom.getAttributes();
+        if ( a != null && a.size() > 0 )
+        {
+            attributes = new HashMap<String, String>( a.size() );
+
+            attributes.putAll( a );
+        }
+
+        setTracker( copyFrom.getTracker() );
 
-       setGroupId( copyFrom.getGroupId() );
-       setArtifactId( copyFrom.getArtifactId() );
-       setVersion( copyFrom.getVersion() );
-       setClassifier( copyFrom.getClassifier() );
-       setType( copyFrom.getType() );
-       setScope( copyFrom.getScope() );
-       
-       Map<String, String> a = copyFrom.getAttributes(); 
-       if(  a != null && a.size() > 0 )
-       {
-           attributes = new HashMap<String, String>( a.size() );
-           
-           attributes.putAll( a );
-       }
-       
-       setTracker( copyFrom.getTracker() );
-       
     }
 
     // ------------------------------------------------------------------
@@ -411,12 +410,12 @@
     {
         this.version = version;
     }
-    
+
     private void checkRangeExists()
     {
-        if( versionRange == null )
+        if ( versionRange == null )
         {
-            if( version == null )
+            if ( version == null )
                 throw new IllegalArgumentException( LANG.getMessage( "artifact.metadata.no.version", toString() ) );
             else
             {
@@ -435,7 +434,7 @@
     public boolean isSingleton()
     {
         checkRangeExists();
-        
+
         return versionRange.isSingleton();
     }
 
@@ -444,28 +443,27 @@
         return !isSingleton();
     }
 
-    /** code quality used to decide whether try or skip a repository - see repository code quality  */
+    /** code quality used to decide whether try or skip a repository - see repository code quality */
     public Quality getRequestedQuality()
     {
-        if( isRange() )
+        if ( isRange() )
             return null;
-        
-        if( isVirtual() )
+
+        if ( isVirtual() )
         {
-            if( isVirtualSnapshot() )
+            if ( isVirtualSnapshot() )
                 return Quality.SNAPSHOT_QUALITY;
-            else
-                if( isVirtualRelease() )
-                    return Quality.RELEASE_QUALITY;
-            
+            else if ( isVirtualRelease() )
+                return Quality.RELEASE_QUALITY;
+
             return null;
         }
-        
-        if( quality != null )
+
+        if ( quality != null )
             return quality;
-        
+
         quality = new Quality( getVersion() );
-        
+
         return quality;
     }
 
@@ -486,7 +484,7 @@
 
     public void setType( String type )
     {
-        if( "test-jar".equals( type ) )
+        if ( "test-jar".equals( type ) )
         {
             setClassifier( "tests" );
             setType( "jar" );
@@ -564,7 +562,7 @@
     {
         this.local = local;
     }
-    
+
     public boolean isPom()
     {
         return "pom".regionMatches( 0, type, 0, 3 );
@@ -681,7 +679,7 @@
     /**
      * run dependency through inclusion/exclusion filters. Inclusion filter is always a "hole"-filter, which is then
      * enhanced by exclusion "cork"-filter
-     *
+     * 
      * @param dep dependency to vet
      * @return vet result
      * @throws VersionException
@@ -792,8 +790,7 @@
     {
         this.timeStamp = timeStamp;
     }
-    
-    
+
     // ---------------------------------------------------------------------------
     // ---------------------------------------------------------------------------
 }

Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java Mon Apr 27 23:12:25 2009
@@ -21,7 +21,7 @@
 /**
  * Type safe reincarnation of Artifact scope. Also supplies the <code>DEFAULT_SCOPE<code> as well
  * as convenience method to deal with scope relationships.
- *
+ * 
  * @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
  */
 public enum ArtifactScopeEnum
@@ -45,7 +45,7 @@
 
     /**
      * Helper method to simplify null processing
-     *
+     * 
      * @return
      */
     public static final ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
@@ -90,7 +90,7 @@
 
     /**
      * scope relationship function. Used by the graph conflict resolution policies
-     *
+     * 
      * @param scope
      * @return true is supplied scope is an inclusive sub-scope of current one.
      */



Mime
View raw message