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:21:57 UTC
svn commit: r660026 [2/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/...
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.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;
import java.util.List;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.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.ArrayList;
import java.util.HashMap;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraph.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.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 org.apache.maven.mercury.ArtifactScopeEnum;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.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 org.apache.maven.mercury.ArtifactScopeEnum;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.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;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolution.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
public class MetadataResolutionException
extends Exception
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.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.List;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
public enum MetadataResolutionRequestTypeEnum
{
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java Sun May 25 13:21:53 2008
@@ -1,11 +1,11 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.conflict.ConflictResolutionException;
-import org.apache.maven.mercury.representation.conflict.ConflictResolver;
-import org.apache.maven.mercury.representation.transform.ClasspathContainer;
-import org.apache.maven.mercury.representation.transform.ClasspathTransformation;
-import org.apache.maven.mercury.representation.transform.MetadataGraphTransformationException;
+import org.apache.maven.mercury.metadata.conflict.ConflictResolutionException;
+import org.apache.maven.mercury.metadata.conflict.ConflictResolver;
+import org.apache.maven.mercury.metadata.transform.ClasspathContainer;
+import org.apache.maven.mercury.metadata.transform.ClasspathTransformation;
+import org.apache.maven.mercury.metadata.transform.MetadataGraphTransformationException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
/**
* entry point into metadata resolution component
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataResolver.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation;
+package org.apache.maven.mercury.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataSource.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java (from r659899, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java&r1=659899&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.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 org.apache.maven.mercury.Artifact;
import org.apache.maven.mercury.ArtifactScopeEnum;
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionException.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionException.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.conflict;
+package org.apache.maven.mercury.metadata.conflict;
/**
*
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionPolicy.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionPolicy.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolutionPolicy.java Sun May 25 13:21:53 2008
@@ -1,6 +1,6 @@
-package org.apache.maven.mercury.representation.conflict;
+package org.apache.maven.mercury.metadata.conflict;
-import org.apache.maven.mercury.representation.MetadataGraphEdge;
+import org.apache.maven.mercury.metadata.MetadataGraphEdge;
/*
* MetadataGraph edge selection policy. Complements GraphConflictResolver by being injected into it
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolver.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/ConflictResolver.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.conflict;
+package org.apache.maven.mercury.metadata.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -16,7 +16,7 @@
*/
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.MetadataGraph;
+import org.apache.maven.mercury.metadata.MetadataGraph;
/*
* Resolves conflicts in the supplied dependency graph. Different implementations will implement
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolutionPolicy.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolutionPolicy.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolutionPolicy.java Sun May 25 13:21:53 2008
@@ -1,8 +1,8 @@
-package org.apache.maven.mercury.representation.conflict;
+package org.apache.maven.mercury.metadata.conflict;
-import org.apache.maven.mercury.representation.MetadataGraphEdge;
-import org.apache.maven.mercury.representation.version.ArtifactVersion;
-import org.apache.maven.mercury.representation.version.DefaultArtifactVersion;
+import org.apache.maven.mercury.metadata.MetadataGraphEdge;
+import org.apache.maven.mercury.metadata.version.ArtifactVersion;
+import org.apache.maven.mercury.metadata.version.DefaultArtifactVersion;
/*
*
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolver.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/conflict/DefaultConflictResolver.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.conflict;
+package org.apache.maven.mercury.metadata.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -20,11 +20,11 @@
import java.util.TreeSet;
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.ArtifactMetadata;
-import org.apache.maven.mercury.representation.MetadataGraph;
-import org.apache.maven.mercury.representation.MetadataGraphEdge;
-import org.apache.maven.mercury.representation.MetadataGraphVertex;
-import org.apache.maven.mercury.representation.MetadataResolutionException;
+import org.apache.maven.mercury.metadata.ArtifactMetadata;
+import org.apache.maven.mercury.metadata.MetadataGraph;
+import org.apache.maven.mercury.metadata.MetadataGraphEdge;
+import org.apache.maven.mercury.metadata.MetadataGraphVertex;
+import org.apache.maven.mercury.metadata.MetadataResolutionException;
/*
* Default conflict resolver.Implements closer newer first policy by default, but could be
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathContainer.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathContainer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathContainer.java Sun May 25 13:21:53 2008
@@ -1,13 +1,13 @@
-package org.apache.maven.mercury.representation.transform;
+package org.apache.maven.mercury.metadata.transform;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.ArtifactMetadata;
-import org.apache.maven.mercury.representation.MetadataResolutionException;
-import org.apache.maven.mercury.representation.MetadataTreeNode;
+import org.apache.maven.mercury.metadata.ArtifactMetadata;
+import org.apache.maven.mercury.metadata.MetadataResolutionException;
+import org.apache.maven.mercury.metadata.MetadataTreeNode;
/*
* classpath container that is aware of the classpath scope
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathTransformation.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathTransformation.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/ClasspathTransformation.java Sun May 25 13:21:53 2008
@@ -1,7 +1,7 @@
-package org.apache.maven.mercury.representation.transform;
+package org.apache.maven.mercury.metadata.transform;
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.MetadataGraph;
+import org.apache.maven.mercury.metadata.MetadataGraph;
/*
* Helper class to conver an Md Graph into some form of a classpath
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/DefaultClasspathTransformation.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/DefaultClasspathTransformation.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/DefaultClasspathTransformation.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.transform;
+package org.apache.maven.mercury.metadata.transform;
import java.util.ArrayList;
import java.util.Arrays;
@@ -6,12 +6,12 @@
import java.util.List;
import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.representation.ArtifactMetadata;
-import org.apache.maven.mercury.representation.MetadataGraph;
-import org.apache.maven.mercury.representation.MetadataGraphEdge;
-import org.apache.maven.mercury.representation.MetadataGraphVertex;
-import org.apache.maven.mercury.representation.conflict.ConflictResolutionException;
-import org.apache.maven.mercury.representation.conflict.ConflictResolver;
+import org.apache.maven.mercury.metadata.ArtifactMetadata;
+import org.apache.maven.mercury.metadata.MetadataGraph;
+import org.apache.maven.mercury.metadata.MetadataGraphEdge;
+import org.apache.maven.mercury.metadata.MetadataGraphVertex;
+import org.apache.maven.mercury.metadata.conflict.ConflictResolutionException;
+import org.apache.maven.mercury.metadata.conflict.ConflictResolver;
/*
* default implementation of the metadata classpath transformer
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/MetadataGraphTransformationException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/MetadataGraphTransformationException.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/MetadataGraphTransformationException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/transform/MetadataGraphTransformationException.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.transform;
+package org.apache.maven.mercury.metadata.transform;
/*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ArtifactVersion.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ArtifactVersion.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ArtifactVersion.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.version;
+package org.apache.maven.mercury.metadata.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ComparableVersion.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ComparableVersion.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ComparableVersion.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/ComparableVersion.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.version;
+package org.apache.maven.mercury.metadata.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/DefaultArtifactVersion.java?rev=660026&r1=659899&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/DefaultArtifactVersion.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/DefaultArtifactVersion.java Sun May 25 13:21:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.representation.version;
+package org.apache.maven.mercury.metadata.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
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=660026&r1=660025&r2=660026&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:21:53 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.client.Binding;
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.retrieve.DefaultRetrievalRequest;
-import org.apache.maven.mercury.client.retrieve.DefaultRetriever;
-import org.apache.maven.mercury.client.retrieve.RetrievalRequest;
-import org.apache.maven.mercury.client.retrieve.RetrievalResponse;
-import org.apache.maven.mercury.client.retrieve.Retriever;
+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;
/**
* @author Jason van Zyl
Modified: maven/sandbox/trunk/mercury/src/main/mdo/metadata.mdo
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/mdo/metadata.mdo?rev=660026&r1=660025&r2=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/mdo/metadata.mdo (original)
+++ maven/sandbox/trunk/mercury/src/main/mdo/metadata.mdo Sun May 25 13:21:53 2008
@@ -24,7 +24,7 @@
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.artifact.repository.metadata</value>
+ <value>org.apache.maven.mercury.repository.metadata</value>
</default>
</defaults>
<classes>
Propchange: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyDeployerTest.java (from r659847, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyDeployerTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyDeployerTest.java?p2=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyDeployerTest.java&p1=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyDeployerTest.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyDeployerTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyDeployerTest.java Sun May 25 13:21:53 2008
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
import junit.framework.TestCase;
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.deploy.DeployRequest;
-import org.apache.maven.mercury.client.deploy.DeployResponse;
-import org.apache.maven.mercury.client.deploy.DefaultDeployer;
-import org.apache.maven.mercury.server.SimplePutServer;
+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.mortbay.util.IO;
Copied: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyRetrieverTest.java (from r659847, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyRetrieverTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyRetrieverTest.java?p2=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyRetrieverTest.java&p1=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyRetrieverTest.java&r1=659847&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/client/JettyRetrieverTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/client/JettyRetrieverTest.java Sun May 25 13:21:53 2008
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.maven.mercury.client;
+package org.apache.maven.mercury.http.client;
import junit.framework.TestCase;
-import org.apache.maven.mercury.client.MercuryException;
-import org.apache.maven.mercury.client.Binding;
-import org.apache.maven.mercury.client.retrieve.DefaultRetriever;
-import org.apache.maven.mercury.client.retrieve.DefaultRetrievalRequest;
-import org.apache.maven.mercury.client.retrieve.RetrievalResponse;
-import org.apache.maven.mercury.server.SimpleTestServer;
+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 java.io.File;
Propchange: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/BatchFilterTest.java (from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/BatchFilterTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/BatchFilterTest.java?p2=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/BatchFilterTest.java&p1=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/BatchFilterTest.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/BatchFilterTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/BatchFilterTest.java Sun May 25 13:21:53 2008
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.maven.mercury.server;
+package org.apache.maven.mercury.http.server;
import junit.framework.TestCase;
-import org.apache.maven.mercury.server.StagingBatchFilter;
+import org.apache.maven.mercury.http.server.StagingBatchFilter;
import org.mortbay.jetty.servlet.FilterHolder;
import org.mortbay.jetty.servlet.DefaultServlet;
import org.mortbay.jetty.testing.HttpTester;
Copied: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimplePutServer.java (from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimplePutServer.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimplePutServer.java?p2=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimplePutServer.java&p1=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimplePutServer.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimplePutServer.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimplePutServer.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 java.io.File;
Copied: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimpleTestServer.java (from r659715, maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimpleTestServer.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimpleTestServer.java?p2=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimpleTestServer.java&p1=maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimpleTestServer.java&r1=659715&r2=660026&rev=660026&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/server/SimpleTestServer.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/http/server/SimpleTestServer.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 java.io.File;
import java.io.FileOutputStream;