maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r660026 [1/2] - in /maven/sandbox/trunk/mercury: ./ src/main/java/org/apache/maven/mercury/ src/main/java/org/apache/maven/mercury/client/ src/main/java/org/apache/maven/mercury/http/ src/main/java/org/apache/maven/mercury/http/client/ src/...
Date Sun, 25 May 2008 20:21:57 GMT
Author: jvanzyl
Date: Sun May 25 13:21:53 2008
New Revision: 660026

URL: http://svn.apache.org/viewvc?rev=660026&view=rev
Log: (empty)

Added:
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java   (with props)
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java   (contents, props changed)
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/Binding.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java   (contents, props changed)
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/ChecksumCalculator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java   (contents, props changed)
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/FileExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java   (contents, props changed)
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/HandshakeExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/MercuryException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/   (props changed)
      - copied from r659700, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/BatchIdGenerator.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/BatchIdGenerator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployResponse.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployer.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployer.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployCallback.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployCallback.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployRequest.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployResponse.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/Deployer.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/Deployer.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeploymentTarget.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeploymentTarget.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/FilePutExchange.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/FilePutExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/RandomBatchIdGenerator.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/RandomBatchIdGenerator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/   (props changed)
      - copied from r659700, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalRequest.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalResponse.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetriever.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetriever.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/FileGetExchange.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/FileGetExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalCallback.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalCallback.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalRequest.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalResponse.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalTarget.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalTarget.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/Retriever.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/Retriever.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/   (props changed)
      - copied from r659700, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/BatchFilter.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/BatchFilter.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/StagingBatchFilter.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/StagingBatchFilter.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java   (contents, props changed)
      - copied, changed from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/   (props changed)
      - copied from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/conflict/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/   (props changed)
      - copied from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/transform/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/   (props changed)
      - copied from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/version/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/   (props changed)
      - copied from r659700, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyDeployerTest.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyDeployerTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyRetrieverTest.java
      - copied, changed from r659847, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyRetrieverTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/   (props changed)
      - copied from r659700, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/BatchFilterTest.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/BatchFilterTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimplePutServer.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimplePutServer.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimpleTestServer.java
      - copied, changed from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimpleTestServer.java
Removed:
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/RetrievalRequestImpl.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/
Modified:
    maven/sandbox/trunk/mercury/notes.txt
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionPolicy.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolver.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolutionPolicy.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolver.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathContainer.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathTransformation.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/DefaultClasspathTransformation.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/MetadataGraphTransformationException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ArtifactVersion.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ComparableVersion.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/DefaultArtifactVersion.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java
    maven/sandbox/trunk/mercury/src/main/mdo/metadata.mdo

Modified: maven/sandbox/trunk/mercury/notes.txt
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/notes.txt?rev=660026&r1=660025&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/notes.txt (original)
+++ maven/sandbox/trunk/mercury/notes.txt Sun May 25 13:21:53 2008
@@ -105,3 +105,12 @@
 
 I have come to the conclusion that providing the necessary support for version ranges cannot be done without a SAT solver, as we are 
 approaching an NP complete problem and we're going to end up with an approximation and all the heavy lifting is being done already by SAT4J.
+
+The Quality of providers
+
+The new processing model will allow the complete manipulation of the resultant set either in memory, or in a location that does not pollute the
+local repository. So any provider must guarantee the safe retrieval of the set the artifacts from remote sources, but must also guarantee the safe 
+placement of that set into the local repository and if the user aborts, or the machine crashes that the provider supplies a means to the 
+process to clean up anything half-baked. We need to provide a single place where a journal can be written which can be easily 
+detected and any action taken if partially complete operations have been detected. We know what can go wrong and every possible measure 
+needs to make sure the repository  cannot be corrupted. 
\ No newline at end of file

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java Sun May 25 13:21:53 2008
@@ -0,0 +1,126 @@
+package org.apache.maven.mercury;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+import java.io.File;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/*
+ * Description of an artifact.
+ * 
+ * @todo do we really need an interface here?
+ * 
+ * @todo get rid of the multiple states we can have (project, parent, etc artifacts, file == null,
+ * snapshot, etc) - construct subclasses and use accordingly?
+ */
+public interface Artifact
+    extends Comparable
+{
+    String LATEST_VERSION = "LATEST";
+
+    String SNAPSHOT_VERSION = "SNAPSHOT";
+
+    Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
+
+    // TODO: into artifactScope handler
+
+    String SCOPE_COMPILE = ArtifactScopeEnum.compile.toString();
+
+    String SCOPE_TEST = ArtifactScopeEnum.test.toString();
+
+    String SCOPE_RUNTIME = ArtifactScopeEnum.runtime.toString();
+
+    String SCOPE_PROVIDED = ArtifactScopeEnum.provided.toString();
+
+    String SCOPE_SYSTEM = ArtifactScopeEnum.system.toString();
+
+    String RELEASE_VERSION = "RELEASE";
+
+    String getGroupId();
+
+    String getArtifactId();
+
+    String getVersion();
+
+    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.
+     *
+     * @return the artifactScope
+     */
+    String getScope();
+
+    String getType();
+
+    String getClassifier();
+
+    // only providing this since classifier is *very* optional...
+    boolean hasClassifier();
+
+    File getFile();
+
+    void setFile( File destination );
+
+    // ----------------------------------------------------------------------
+
+    String getId();
+
+    String getDependencyConflictId();
+
+    void setRepository( ArtifactRepository remoteRepository );
+
+    ArtifactRepository getRepository();
+
+    void updateVersion( String version, ArtifactRepository localRepository );
+
+    String getDownloadUrl();
+
+    void setDownloadUrl( String downloadUrl );
+
+    List<String> getDependencyTrail();
+
+    void setDependencyTrail( List<String> dependencyTrail );
+
+    void setScope( String scope );
+
+    void selectVersion( String version );
+
+    void setGroupId( String groupId );
+
+    void setArtifactId( String artifactId );
+
+    boolean isSnapshot();
+
+    void setResolved( boolean resolved );
+
+    boolean isResolved();
+
+    void setResolvedVersion( String version );
+
+    boolean isRelease();
+
+    void setRelease( boolean release );
+
+    boolean isOptional();
+
+    void setOptional( boolean optional );
+
+    String getInheritedScope();
+}
\ No newline at end of file

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java Sun May 25 13:21:53 2008
@@ -0,0 +1,47 @@
+package org.apache.maven.mercury;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Specifies the repository used for artifact handling.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public interface ArtifactRepository
+{
+    String pathOf( Artifact artifact );
+
+    String getUrl();
+
+    String getBasedir();
+
+    String getProtocol();
+
+    String getId();
+
+    String getKey();
+
+    boolean isUniqueVersion();
+
+    void setBlacklisted( boolean blackListed );
+
+    boolean isBlacklisted();
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepository.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java Sun May 25 13:21:53 2008
@@ -0,0 +1,28 @@
+package org.apache.maven.mercury;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/** @author jdcasey */
+public interface ArtifactRepositoryLayout
+{
+    String ROLE = ArtifactRepositoryLayout.class.getName();
+
+    String pathOf( Artifact artifact );
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactRepositoryLayout.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java Sun May 25 13:21:53 2008
@@ -0,0 +1,25 @@
+package org.apache.maven.mercury;
+
+public class ArtifactResolutionException
+    extends Exception
+{
+
+    public ArtifactResolutionException( String message, Throwable cause )
+    {
+        super( message, cause );
+        // TODO Auto-generated constructor stub
+    }
+
+    public ArtifactResolutionException( String message )
+    {
+        super( message );
+        // TODO Auto-generated constructor stub
+    }
+
+    public ArtifactResolutionException( Throwable cause )
+    {
+        super( cause );
+        // TODO Auto-generated constructor stub
+    }
+    
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java Sun May 25 13:21:53 2008
@@ -0,0 +1,106 @@
+package org.apache.maven.mercury;
+
+/**
+ * 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
+{
+    compile( 1 ), test( 2 ), runtime( 3 ), provided( 4 ), system( 5 );
+
+    public static final ArtifactScopeEnum DEFAULT_SCOPE = compile;
+
+    private int id;
+
+    // Constructor
+    ArtifactScopeEnum( int id )
+    {
+        this.id = id;
+    }
+
+    int getId()
+    {
+        return id;
+    }
+
+
+    /**
+     * Helper method to simplify null processing
+     * 
+     * @return 
+     */
+    public static final ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
+    {
+    	return scope == null ? DEFAULT_SCOPE : scope;
+    }
+    
+    /**
+     * 
+     * @return unsafe String representation of this scope.
+     */
+    public String getScope()
+    {
+        if ( id == 1 )
+        {
+            return Artifact.SCOPE_COMPILE;
+        }
+        else if ( id == 2 )
+        {
+            return Artifact.SCOPE_TEST;
+
+        }
+        else if ( id == 3 )
+        {
+            return Artifact.SCOPE_RUNTIME;
+
+        }
+        else if ( id == 4 )
+        {
+            return Artifact.SCOPE_PROVIDED;
+        }
+        else
+        {
+            return Artifact.SCOPE_SYSTEM;
+        }
+    }
+    
+    private static final ArtifactScopeEnum [][][] _compliancySets = {
+    	  { { compile  }, { compile,                provided, system } }
+      	, { { test     }, { compile, test,          provided, system } }
+    	, { { runtime  }, { compile,       runtime,           system } }
+    	, { { provided }, { compile, test,          provided         } }
+    };
+    
+    /**
+     * 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.
+     */
+    public boolean encloses( ArtifactScopeEnum scope )
+    {
+    	final ArtifactScopeEnum s = checkScope(scope);
+    	
+    	// system scope is historic only - and simple
+    	if( id == system.id )
+    		return scope.id == system.id;
+
+    	for( ArtifactScopeEnum[][] set : _compliancySets  )
+    	{
+    		if( id == set[0][0].id )
+    		{
+    			for( ArtifactScopeEnum ase : set[1] )
+    			{
+    				if( s.id == ase.id )
+    					return true;
+    			}
+    			break;
+    		}
+    	}
+    	return false;
+    }
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java Sun May 25 13:21:53 2008
@@ -0,0 +1,510 @@
+package org.apache.maven.mercury;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+import java.io.File;
+import java.util.List;
+import java.util.regex.Matcher;
+
+import org.codehaus.plexus.util.StringUtils;
+
+/*
+ * @author Jason van Zyl
+ * 
+ * @version $Id$
+ * 
+ * @todo this should possibly be replaced by type handler
+ */
+public class DefaultArtifact
+    implements Artifact
+{
+    private String groupId;
+
+    private String artifactId;
+
+    /**
+     * The resolved version for the artifact after conflict resolution, that has not been transformed.
+     *
+     * @todo should be final
+     */
+    private String baseVersion;
+
+    private String type;
+
+    private File file;
+
+    private String version;
+
+    // This is Maven specific. jvz/
+    private String classifier;
+
+    private String scope;
+
+    private boolean optional;
+
+    private boolean release;
+
+    private boolean resolved;
+
+    private List dependencyTrail;
+
+    // Why is this here? What repository is determined at runtime and is therefore a
+    // runtime charactistic. This needs to go. jvz.
+    private ArtifactRepository repository;
+
+    private String downloadUrl;
+
+    private String inheritedScope;
+    
+    public DefaultArtifact( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
+    {
+        if ( version == null )
+        {
+            throw new IllegalArgumentException( "Version cannot be null." );
+        }
+
+        initialize( groupId, artifactId, version, type, classifier, optional, scope, inheritedScope );
+    }
+
+    public String getInheritedScope()
+    {
+        return inheritedScope;
+    }
+    
+    private void initialize( String groupId, String artifactId, String version, String type, String classifier, boolean optional, String scope, String inheritedScope )
+    {
+        this.inheritedScope = inheritedScope;
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        //this.scope = scope;
+        this.type = type;
+        this.classifier = classifier;
+        this.optional = optional;
+
+        String desiredScope = Artifact.SCOPE_RUNTIME;
+
+        boolean calc = true;
+
+        if ( inheritedScope == null )
+        {
+            desiredScope = scope;
+        }
+        else if ( Artifact.SCOPE_TEST.equals( scope ) || Artifact.SCOPE_PROVIDED.equals( scope ) )
+        {
+            desiredScope = scope;
+            //calc = false;
+        }
+        else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equals( inheritedScope ) )
+        {
+            // added to retain compile artifactScope. Remove if you want compile inherited as runtime
+            desiredScope = Artifact.SCOPE_COMPILE;
+        }
+
+        if ( calc )
+        {
+            if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
+            {
+                desiredScope = Artifact.SCOPE_TEST;
+            }
+
+            if ( Artifact.SCOPE_PROVIDED.equals( inheritedScope ) )
+            {
+                desiredScope = Artifact.SCOPE_PROVIDED;
+            }
+
+            if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+            {
+                // system scopes come through unchanged...
+                desiredScope = Artifact.SCOPE_SYSTEM;
+            }
+        }
+        
+        this.scope = desiredScope;
+
+        validateIdentity();
+    }
+
+    private void validateIdentity()
+    {
+        if ( empty( groupId ) )
+        {
+            throw new IllegalArgumentException( "The groupId cannot be empty." );
+        }
+
+        if ( artifactId == null )
+        {
+            throw new IllegalArgumentException( "The artifactId cannot be empty." );
+        }
+
+        if ( type == null )
+        {
+            throw new IllegalArgumentException( "The type cannot be empty." );
+        }
+
+        if ( ( version == null ) )
+        {
+            throw new IllegalArgumentException( "The version cannot be empty." );
+        }
+    }
+
+    private boolean empty( String value )
+    {
+        return ( value == null ) || ( value.trim().length() < 1 );
+    }
+
+    public String getClassifier()
+    {
+        return classifier;
+    }
+
+    public boolean hasClassifier()
+    {
+        return StringUtils.isNotEmpty( classifier );
+    }
+
+    public String getScope()
+    {
+        return scope;
+    }
+
+    public String getGroupId()
+    {
+        return groupId;
+    }
+
+    public String getArtifactId()
+    {
+        return artifactId;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public void setVersion( String version )
+    {
+        this.version = version;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setFile( File file )
+    {
+        this.file = file;
+    }
+
+    public File getFile()
+    {
+        return file;
+    }
+
+    public ArtifactRepository getRepository()
+    {
+        return repository;
+    }
+
+    public void setRepository( ArtifactRepository repository )
+    {
+        this.repository = repository;
+    }
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    public String getId()
+    {
+        return getDependencyConflictId() + ":" + getBaseVersion();
+    }
+
+    public String getDependencyConflictId()
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append( getGroupId() );
+        sb.append( ":" );
+        appendArtifactTypeClassifierString( sb );
+        return sb.toString();
+    }
+
+    private void appendArtifactTypeClassifierString( StringBuffer sb )
+    {
+        sb.append( getArtifactId() );
+        sb.append( ":" );
+        sb.append( getType() );
+        if ( hasClassifier() )
+        {
+            sb.append( ":" );
+            sb.append( getClassifier() );
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    // Object overrides
+    // ----------------------------------------------------------------------
+
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+        if ( getGroupId() != null )
+        {
+            sb.append( getGroupId() );
+            sb.append( ":" );
+        }
+        appendArtifactTypeClassifierString( sb );
+        sb.append( ":" );
+        
+        if ( getVersion() != null )
+        {
+            sb.append( getBaseVersionInternal() );
+        }
+        
+        if ( scope != null )
+        {
+            sb.append( ":" );
+            sb.append( scope );
+        }
+        return sb.toString();
+    }
+
+    public int hashCode()
+    {
+        int result = 17;
+        result = 37 * result + groupId.hashCode();
+        result = 37 * result + artifactId.hashCode();
+        result = 37 * result + type.hashCode();
+        if ( version != null )
+        {
+            result = 37 * result + version.hashCode();
+        }
+        result = 37 * result + ( classifier != null ? classifier.hashCode() : 0 );
+        return result;
+    }
+
+    public boolean equals( Object o )
+    {
+        if ( o == this )
+        {
+            return true;
+        }
+
+        if ( !( o instanceof Artifact ) )
+        {
+            return false;
+        }
+
+        Artifact a = (Artifact) o;
+
+        if ( !a.getGroupId().equals( groupId ) )
+        {
+            return false;
+        }
+        else if ( !a.getArtifactId().equals( artifactId ) )
+        {
+            return false;
+        }
+        else if ( !a.getVersion().equals( version ) )
+        {
+            return false;
+        }
+        else if ( !a.getType().equals( type ) )
+        {
+            return false;
+        }
+        else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
+        {
+            return false;
+        }
+
+        // We don't consider the version range in the comparison, just the resolved version
+
+        return true;
+    }
+
+    public String getBaseVersion()
+    {
+        if ( baseVersion == null )
+        {
+            if ( version == null )
+            {
+                throw new NullPointerException( "version was null for " + groupId + ":" + artifactId );
+            }
+            setBaseVersionInternal( version );
+        }
+        return baseVersion;
+    }
+
+    protected String getBaseVersionInternal()
+    {
+        if ( ( baseVersion == null ) && ( version != null ) )
+        {
+            setBaseVersionInternal( version );
+        }
+
+        return baseVersion;
+    }
+
+    public void setBaseVersion( String baseVersion )
+    {
+        setBaseVersionInternal( baseVersion );
+    }
+
+    protected void setBaseVersionInternal( String baseVersion )
+    {
+        Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
+        if ( m.matches() )
+        {
+            this.baseVersion = m.group( 1 ) + "-" + SNAPSHOT_VERSION;
+        }
+        else
+        {
+            this.baseVersion = baseVersion;
+        }
+    }
+
+    public int compareTo( Object o )
+    {
+        Artifact a = (Artifact) o;
+
+        int result = groupId.compareTo( a.getGroupId() );
+        if ( result == 0 )
+        {
+            result = artifactId.compareTo( a.getArtifactId() );
+            if ( result == 0 )
+            {
+                result = type.compareTo( a.getType() );
+                if ( result == 0 )
+                {
+                    if ( classifier == null )
+                    {
+                        if ( a.getClassifier() != null )
+                        {
+                            result = 1;
+                        }
+                    }
+                    else
+                    {
+                        if ( a.getClassifier() != null )
+                        {
+                            result = classifier.compareTo( a.getClassifier() );
+                        }
+                        else
+                        {
+                            result = -1;
+                        }
+                    }
+                    if ( result == 0 )
+                    {
+                        // We don't consider the version range in the comparison, just the resolved version
+                        result = version.compareTo( a.getVersion() );
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    public void updateVersion( String version, ArtifactRepository localRepository )
+    {
+        setResolvedVersion( version );
+        setFile( new File( localRepository.getBasedir(), localRepository.pathOf( this ) ) );
+    }
+
+    public String getDownloadUrl()
+    {
+        return downloadUrl;
+    }
+
+    public void setDownloadUrl( String downloadUrl )
+    {
+        this.downloadUrl = downloadUrl;
+    }
+
+    public List<String> getDependencyTrail()
+    {
+        return dependencyTrail;
+    }
+
+    public void setDependencyTrail( List<String> dependencyTrail )
+    {
+        this.dependencyTrail = dependencyTrail;
+    }
+
+    public void setScope( String scope )
+    {
+        this.scope = scope;
+    }
+
+    public void selectVersion( String version )
+    {
+        this.version = version;
+        setBaseVersionInternal( version );
+    }
+
+    public void setGroupId( String groupId )
+    {
+        this.groupId = groupId;
+    }
+
+    public void setArtifactId( String artifactId )
+    {
+        this.artifactId = artifactId;
+    }
+
+    public boolean isSnapshot()
+    {
+        return getBaseVersion() != null && ( getBaseVersion().endsWith( SNAPSHOT_VERSION ) || getBaseVersion().equals( LATEST_VERSION ) );
+    }
+
+    public void setResolved( boolean resolved )
+    {
+        this.resolved = resolved;
+    }
+
+    public boolean isResolved()
+    {
+        return resolved;
+    }
+
+    public void setResolvedVersion( String version )
+    {
+        this.version = version;
+        // retain baseVersion
+    }
+
+    public void setRelease( boolean release )
+    {
+        this.release = release;
+    }
+
+    public boolean isRelease()
+    {
+        return release;
+    }
+
+    public boolean isOptional()
+    {
+        return optional;
+    }
+
+    public void setOptional( boolean optional )
+    {
+        this.optional = optional;
+    }
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java?rev=660026&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java Sun May 25 13:21:53 2008
@@ -0,0 +1,66 @@
+package org.apache.maven.mercury;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author jdcasey
+ * @plexus.component role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" role-hint="default"
+ */
+public class DefaultRepositoryLayout
+    implements ArtifactRepositoryLayout
+{
+    private static final char PATH_SEPARATOR = '/';
+
+    private static final char GROUP_SEPARATOR = '.';
+
+    private static final char ARTIFACT_SEPARATOR = '-';
+
+    public String pathOf( Artifact artifact )
+    {
+        StringBuffer path = new StringBuffer();
+
+        path.append( formatAsDirectory( artifact.getGroupId() ) ).append( PATH_SEPARATOR );
+        path.append( artifact.getArtifactId() ).append( PATH_SEPARATOR );
+        path.append( artifact.getVersion() ).append( PATH_SEPARATOR );
+        path.append( artifact.getArtifactId() ).append( ARTIFACT_SEPARATOR ).append( artifact.getVersion() );
+
+        if ( artifact.hasClassifier() )
+        {
+            path.append( ARTIFACT_SEPARATOR ).append( artifact.getClassifier() );
+        }
+
+        path.append( GROUP_SEPARATOR ).append( "pom" );
+        
+        /*
+        if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 )
+        {
+            path.append( GROUP_SEPARATOR ).append( artifactHandler.getExtension() );
+        }
+        */
+
+        return path.toString();
+    }
+
+    private String formatAsDirectory( String directory )
+    {
+        return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR );
+    }
+
+}

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultRepositoryLayout.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/Binding.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/Binding.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/Binding.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
 
 import java.io.File;
 

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/ChecksumCalculator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/ChecksumCalculator.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/ChecksumCalculator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
 
 import org.mortbay.util.IO;
 

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/FileExchange.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/FileExchange.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/FileExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
 
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.client.HttpClient;

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/HandshakeExchange.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/HandshakeExchange.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/HandshakeExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
 
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.client.HttpClient;

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/MercuryException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/MercuryException.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/MercuryException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java Sun May 25 13:21:53 2008
@@ -31,7 +31,7 @@
 //limitations under the License.
 //========================================================================
 
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
 
 /**
  * BatchException

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/BatchIdGenerator.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/BatchIdGenerator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/BatchIdGenerator.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/BatchIdGenerator.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/BatchIdGenerator.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/BatchIdGenerator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/BatchIdGenerator.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 public interface BatchIdGenerator
 {

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployResponse.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployResponse.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployResponse.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployResponse.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployResponse.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployResponse.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployResponse.java Sun May 25 13:21:53 2008
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.maven.mercury.client.MercuryException;
+import org.apache.maven.mercury.http.client.MercuryException;
 
 public class DefaultDeployResponse implements DeployResponse
 {

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployer.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployer.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployer.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployer.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployer.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DefaultDeployer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DefaultDeployer.java Sun May 25 13:21:53 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.FileExchange;
-import org.apache.maven.mercury.client.HandshakeExchange;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.FileExchange;
+import org.apache.maven.mercury.http.client.HandshakeExchange;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.jetty.client.HttpClient;
 
@@ -99,7 +99,7 @@
      * files have been successfully deployed, or one or more failures have
      * occurred, depending on the failFast setting of the DeployRequest.
      *
-     * @see org.apache.maven.mercury.client.deploy.Deployer#deploy(org.apache.maven.mercury.client.deploy.DeployRequest)
+     * @see org.apache.maven.mercury.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.http.client.deploy.DeployRequest)
      */
     public DeployResponse deploy( DeployRequest request )
     {
@@ -139,7 +139,7 @@
      * all the files have been deployed or one or more errors occur (depends on the FailFast
      * setting of the DeployRequest).
      *
-     * @see org.apache.maven.mercury.client.deploy.Deployer#deploy(org.apache.maven.mercury.client.deploy.DeployRequest, org.apache.maven.mercury.client.deploy.DeployCallback)
+     * @see org.apache.maven.mercury.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.http.client.deploy.DeployRequest, org.apache.maven.mercury.http.client.deploy.DeployCallback)
      */
     public void deploy( final DeployRequest request, final DeployCallback callback )
     {

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployCallback.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployCallback.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployCallback.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployCallback.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployCallback.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployCallback.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployCallback.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 /**
  * DeployCallback

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployRequest.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployRequest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployRequest.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployRequest.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployRequest.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployRequest.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.client.Binding;
+import org.apache.maven.mercury.http.client.Binding;
 import org.apache.maven.mercury.validate.Validator;
 
 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployResponse.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployResponse.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployResponse.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployResponse.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployResponse.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeployResponse.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeployResponse.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.client.MercuryException;
+import org.apache.maven.mercury.http.client.MercuryException;
 
 /**
  * DeployResponse

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/Deployer.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/Deployer.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/Deployer.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/Deployer.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/Deployer.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/Deployer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/Deployer.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 /**
  * Deployer

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeploymentTarget.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeploymentTarget.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeploymentTarget.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeploymentTarget.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeploymentTarget.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/DeploymentTarget.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/DeploymentTarget.java Sun May 25 13:21:53 2008
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.apache.maven.mercury.validate.Validator;
 import org.mortbay.jetty.client.HttpClient;
 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/FilePutExchange.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/FilePutExchange.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/FilePutExchange.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/FilePutExchange.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/FilePutExchange.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/FilePutExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/FilePutExchange.java Sun May 25 13:21:53 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.ChecksumCalculator;
-import org.apache.maven.mercury.client.FileExchange;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.ChecksumCalculator;
+import org.apache.maven.mercury.http.client.FileExchange;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.jetty.client.HttpClient;

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/RandomBatchIdGenerator.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/RandomBatchIdGenerator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/RandomBatchIdGenerator.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/RandomBatchIdGenerator.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/RandomBatchIdGenerator.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/deploy/RandomBatchIdGenerator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/RandomBatchIdGenerator.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.deploy;
+package org.apache.maven.mercury.http.client.deploy;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalRequest.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalRequest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalRequest.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalRequest.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalRequest.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalRequest.java Sun May 25 13:21:53 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.maven.mercury.client.Binding;
+import org.apache.maven.mercury.http.client.Binding;
 import org.apache.maven.mercury.validate.Validator;
 
 public class DefaultRetrievalRequest implements RetrievalRequest

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalResponse.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalResponse.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalResponse.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalResponse.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalResponse.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetrievalResponse.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetrievalResponse.java Sun May 25 13:21:53 2008
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.maven.mercury.client.MercuryException;
+import org.apache.maven.mercury.http.client.MercuryException;
 
 public class DefaultRetrievalResponse implements RetrievalResponse
 {

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetriever.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetriever.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetriever.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetriever.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetriever.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/DefaultRetriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/DefaultRetriever.java Sun May 25 13:21:53 2008
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.mortbay.jetty.client.HttpClient;
 
 import java.util.ArrayList;

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/FileGetExchange.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/FileGetExchange.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/FileGetExchange.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/FileGetExchange.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/FileGetExchange.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/FileGetExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/FileGetExchange.java Sun May 25 13:21:53 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.ChecksumCalculator;
-import org.apache.maven.mercury.client.FileExchange;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.ChecksumCalculator;
+import org.apache.maven.mercury.http.client.FileExchange;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.jetty.client.HttpClient;

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalCallback.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalCallback.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalCallback.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalCallback.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalCallback.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalCallback.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalCallback.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 /**
  * Classes that implement this method will be notified when a given job has

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalRequest.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalRequest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalRequest.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalRequest.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalRequest.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalRequest.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.client.Binding;
+import org.apache.maven.mercury.http.client.Binding;
 import org.apache.maven.mercury.validate.Validator;
 
 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalResponse.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalResponse.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalResponse.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalResponse.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalResponse.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalResponse.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalResponse.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.client.MercuryException;
+import org.apache.maven.mercury.http.client.MercuryException;
 
 
 /**

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalTarget.java (from r659847, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalTarget.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalTarget.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalTarget.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalTarget.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/RetrievalTarget.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/RetrievalTarget.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.FileExchange;
+import org.apache.maven.mercury.http.client.Binding;
+import org.apache.maven.mercury.http.client.FileExchange;
+import org.apache.maven.mercury.http.client.MercuryException;
 import org.apache.maven.mercury.validate.Validator;
 import org.mortbay.jetty.client.HttpExchange;
 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/Retriever.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/Retriever.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/Retriever.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/Retriever.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/Retriever.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/client/retrieve/Retriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/Retriever.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.client.retrieve;
+package org.apache.maven.mercury.http.client.retrieve;
 
 /**
  * Retriever

Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/BatchFilter.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/BatchFilter.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/BatchFilter.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/BatchFilter.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/BatchFilter.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/BatchFilter.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/BatchFilter.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.server;
+package org.apache.maven.mercury.http.server;
 
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.servlet.PutFilter;

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/StagingBatchFilter.java (from r659715, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/StagingBatchFilter.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/StagingBatchFilter.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/StagingBatchFilter.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/StagingBatchFilter.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/server/StagingBatchFilter.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/StagingBatchFilter.java Sun May 25 13:21:53 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.server;
+package org.apache.maven.mercury.http.server;
 
 import org.mortbay.util.IO;
 import org.mortbay.util.URIUtil;

Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
 
 import java.util.Collection;
 



Mime
View raw message