You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/05/25 22:24:51 UTC

svn commit: r660027 - in /maven/sandbox/trunk/mercury/src: main/java/org/apache/maven/mercury/http/ main/java/org/apache/maven/mercury/retrieve/ main/java/org/apache/maven/mercury/spi/ main/java/org/apache/maven/mercury/spi/http/ main/java/org/apache/m...

Author: jvanzyl
Date: Sun May 25 13:24:50 2008
New Revision: 660027

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

Added:
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/Binding.java
      - copied, changed from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/Binding.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/ChecksumCalculator.java
      - copied, changed from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/ChecksumCalculator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/FileExchange.java
      - copied, changed from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/FileExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
      - copied, changed from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/HandshakeExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/MercuryException.java
      - copied, changed from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/MercuryException.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/
      - copied from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/deploy/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/
      - copied from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/client/retrieve/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/server/
      - copied from r660026, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/server/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/   (props changed)
      - copied from r660025, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/validate/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/
      - copied from r660026, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/
      - copied from r660026, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/
Removed:
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/http/
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/validate/
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/
Modified:
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/BatchIdGenerator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/RandomBatchIdGenerator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetriever.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalCallback.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalResponse.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/server/BatchFilter.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/server/StagingBatchFilter.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java
    maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java
    maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java Sun May 25 13:24:50 2008
@@ -24,13 +24,13 @@
 import org.apache.maven.mercury.ArtifactRepository;
 import org.apache.maven.mercury.ArtifactRepositoryLayout;
 import org.apache.maven.mercury.DefaultRepositoryLayout;
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.http.client.MercuryException;
-import org.apache.maven.mercury.http.client.retrieve.DefaultRetrievalRequest;
-import org.apache.maven.mercury.http.client.retrieve.DefaultRetriever;
-import org.apache.maven.mercury.http.client.retrieve.RetrievalRequest;
-import org.apache.maven.mercury.http.client.retrieve.RetrievalResponse;
-import org.apache.maven.mercury.http.client.retrieve.Retriever;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
+import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
+import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalRequest;
+import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalResponse;
+import org.apache.maven.mercury.spi.http.client.retrieve.Retriever;
 
 /**
  * @author Jason van Zyl

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

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

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

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

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/BatchIdGenerator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/BatchIdGenerator.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/BatchIdGenerator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/BatchIdGenerator.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
 public interface BatchIdGenerator
 {

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DefaultDeployer.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
-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.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.FileExchange;
+import org.apache.maven.mercury.spi.http.client.HandshakeExchange;
+import org.apache.maven.mercury.spi.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.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.http.client.deploy.DeployRequest)
+     * @see org.apache.maven.mercury.spi.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.spi.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.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.http.client.deploy.DeployRequest, org.apache.maven.mercury.http.client.deploy.DeployCallback)
+     * @see org.apache.maven.mercury.spi.http.client.deploy.Deployer#deploy(org.apache.maven.mercury.spi.http.client.deploy.DeployRequest, org.apache.maven.mercury.spi.http.client.deploy.DeployCallback)
      */
     public void deploy( final DeployRequest request, final DeployCallback callback )
     {

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployCallback.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
 /**
  * DeployCallback

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeployRequest.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.validate.Validator;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 
 
 /**

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/Deployer.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
 /**
  * Deployer

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java Sun May 25 13:24:50 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
-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.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 import org.mortbay.jetty.client.HttpClient;
 
 import java.io.File;

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.deploy;
+package org.apache.maven.mercury.spi.http.client.deploy;
 
-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.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.ChecksumCalculator;
+import org.apache.maven.mercury.spi.http.client.FileExchange;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.jetty.client.HttpClient;

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/DefaultRetrievalRequest.java Sun May 25 13:24:50 2008
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.retrieve;
+package org.apache.maven.mercury.spi.http.client.retrieve;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.validate.Validator;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 
 public class DefaultRetrievalRequest implements RetrievalRequest
 {

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

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.retrieve;
+package org.apache.maven.mercury.spi.http.client.retrieve;
 
-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.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.ChecksumCalculator;
+import org.apache.maven.mercury.spi.http.client.FileExchange;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
 import org.mortbay.io.Buffer;
 import org.mortbay.jetty.HttpMethods;
 import org.mortbay.jetty.client.HttpClient;

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalRequest.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.retrieve;
+package org.apache.maven.mercury.spi.http.client.retrieve;
 
 import java.util.Set;
 
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.validate.Validator;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 
 
 /**

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java Sun May 25 13:24:50 2008
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.retrieve;
+package org.apache.maven.mercury.spi.http.client.retrieve;
 
-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.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.FileExchange;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 import org.mortbay.jetty.client.HttpExchange;
 
 import javax.servlet.http.HttpServletResponse;

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/Retriever.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client.retrieve;
+package org.apache.maven.mercury.spi.http.client.retrieve;
 
 /**
  * Retriever

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

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

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

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java?rev=660027&r1=660025&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/PomValidator.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.validate;
+package org.apache.maven.mercury.spi.http.validate;
 
 import org.codehaus.plexus.util.FileUtils;
 

Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java?rev=660027&r1=660025&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/spi/http/validate/Validator.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.validate;
+package org.apache.maven.mercury.spi.http.validate;
 
 import java.util.List;
 

Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyDeployerTest.java Sun May 25 13:24:50 2008
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client;
+package org.apache.maven.mercury.spi.http.client;
 
 import junit.framework.TestCase;
 
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.http.client.MercuryException;
-import org.apache.maven.mercury.http.client.deploy.DefaultDeployer;
-import org.apache.maven.mercury.http.client.deploy.DeployRequest;
-import org.apache.maven.mercury.http.client.deploy.DeployResponse;
-import org.apache.maven.mercury.http.server.SimplePutServer;
-import org.apache.maven.mercury.validate.Validator;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.client.deploy.DefaultDeployer;
+import org.apache.maven.mercury.spi.http.client.deploy.DeployRequest;
+import org.apache.maven.mercury.spi.http.client.deploy.DeployResponse;
+import org.apache.maven.mercury.spi.http.server.SimplePutServer;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 import org.mortbay.util.IO;
 
 import java.io.File;

Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/client/JettyRetrieverTest.java Sun May 25 13:24:50 2008
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.client;
+package org.apache.maven.mercury.spi.http.client;
 
 import junit.framework.TestCase;
 
-import org.apache.maven.mercury.http.client.Binding;
-import org.apache.maven.mercury.http.client.MercuryException;
-import org.apache.maven.mercury.http.client.retrieve.DefaultRetrievalRequest;
-import org.apache.maven.mercury.http.client.retrieve.DefaultRetriever;
-import org.apache.maven.mercury.http.client.retrieve.RetrievalResponse;
-import org.apache.maven.mercury.http.server.SimpleTestServer;
-import org.apache.maven.mercury.validate.Validator;
+import org.apache.maven.mercury.spi.http.client.Binding;
+import org.apache.maven.mercury.spi.http.client.MercuryException;
+import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
+import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
+import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalResponse;
+import org.apache.maven.mercury.spi.http.server.SimpleTestServer;
+import org.apache.maven.mercury.spi.http.validate.Validator;
 
 import java.io.File;
 import java.util.HashSet;

Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java Sun May 25 13:24:50 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.server;
+package org.apache.maven.mercury.spi.http.server;
 
 import junit.framework.TestCase;
 
-import org.apache.maven.mercury.http.server.StagingBatchFilter;
+import org.apache.maven.mercury.spi.http.server.StagingBatchFilter;
 import org.mortbay.jetty.servlet.FilterHolder;
 import org.mortbay.jetty.servlet.DefaultServlet;
 import org.mortbay.jetty.testing.HttpTester;

Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimplePutServer.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.server;
+package org.apache.maven.mercury.spi.http.server;
 
 import java.io.File;
 

Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java?rev=660027&r1=660026&r2=660027&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java Sun May 25 13:24:50 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.mercury.http.server;
+package org.apache.maven.mercury.spi.http.server;
 
 import java.io.File;
 import java.io.FileOutputStream;