You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/11/22 08:51:06 UTC
svn commit: r719824 - in /geronimo/gshell/trunk: ./ gshell-support/
gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/
gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/
gs...
Author: jdillon
Date: Fri Nov 21 23:51:05 2008
New Revision: 719824
URL: http://svn.apache.org/viewvc?rev=719824&view=rev
Log:
Bring back maven-artifact resolution stuff, add start of mercury support
Added:
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactRepositoryManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactRepositoryManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactMetadataSource.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactResolver.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/InvalidRepositoryException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ResolutionException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml (contents, props changed)
- copied, changed from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest-context.xml
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml (with props)
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/java/org/apache/geronimo/gshell/artifact/mercury/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/apache/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/apache/geronimo/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/apache/geronimo/gshell/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/apache/geronimo/gshell/artifact/
geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/src/main/resources/org/apache/geronimo/gshell/artifact/mercury/
Removed:
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactRepositoryManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactRepositoryManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactMetadataSource.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactResolver.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/InvalidRepositoryException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ResolutionException.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/monitor/
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest.java
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest-context.xml
Modified:
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/components.xml
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/plexus.xml
geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/pom.xml
geronimo/gshell/trunk/pom.xml
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManager.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManager.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerException.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerException.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerException.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
/**
* Thrown to indicate a problem with an {@link ArtifactManager} operation.
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java Fri Nov 21 23:51:05 2008
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
-import org.apache.geronimo.gshell.artifact.Slf4jLoggingManager;
+import org.apache.geronimo.gshell.plexus.Slf4jLoggingManager;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactRepositoryManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactRepositoryManager.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactRepositoryManager.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.repository.ArtifactRepository;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactManager.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactManager.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactRepositoryManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactRepositoryManager.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/DefaultArtifactRepositoryManager.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactMetadataSource.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactMetadataSource.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactMetadataSource.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactMetadataSource.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactResolver.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactResolver.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/GShellArtifactResolver.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/InvalidRepositoryException.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/InvalidRepositoryException.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/InvalidRepositoryException.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
/**
* Thrown to indicate that a given repository is not valid.
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ResolutionException.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ResolutionException.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/ResolutionException.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java Fri Nov 21 23:51:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/components.xml?rev=719824&r1=719823&r2=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/components.xml Fri Nov 21 23:51:05 2008
@@ -23,8 +23,8 @@
<component-set>
<components>
<component>
- <role>org.apache.geronimo.gshell.artifact.ArtifactManager</role>
- <implementation>org.apache.geronimo.gshell.artifact.DefaultArtifactManager</implementation>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactManager</role>
+ <implementation>org.apache.geronimo.gshell.artifact.maven.DefaultArtifactManager</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
@@ -32,7 +32,7 @@
<field-name>artifactFactory</field-name>
</requirement>
<requirement>
- <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactRepositoryManager</role>
<field-name>repositoryManager</field-name>
</requirement>
<requirement>
@@ -52,8 +52,8 @@
</component>
<component>
- <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
- <implementation>org.apache.geronimo.gshell.artifact.DefaultArtifactRepositoryManager</implementation>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactRepositoryManager</role>
+ <implementation>org.apache.geronimo.gshell.artifact.maven.DefaultArtifactRepositoryManager</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
@@ -66,7 +66,7 @@
<component>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>gshell</role-hint>
- <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactMetadataSource</implementation>
+ <implementation>org.apache.geronimo.gshell.artifact.maven.GShellArtifactMetadataSource</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
@@ -75,7 +75,7 @@
<field-name>delegate</field-name>
</requirement>
<requirement>
- <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactRepositoryManager</role>
<field-name>repositoryManager</field-name>
</requirement>
</requirements>
@@ -84,7 +84,7 @@
<component>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
<role-hint>gshell</role-hint>
- <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactResolver</implementation>
+ <implementation>org.apache.geronimo.gshell.artifact.maven.GShellArtifactResolver</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
@@ -93,7 +93,7 @@
<field-name>delegate</field-name>
</requirement>
<requirement>
- <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactRepositoryManager</role>
<field-name>repositoryManager</field-name>
</requirement>
</requirements>
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/plexus.xml?rev=719824&r1=719823&r2=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/plexus/plexus.xml Fri Nov 21 23:51:05 2008
@@ -29,7 +29,7 @@
<component>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
<role-hint>default</role-hint>
- <implementation>org.apache.geronimo.gshell.artifact.GShellArtifactResolver</implementation>
+ <implementation>org.apache.geronimo.gshell.artifact.maven.GShellArtifactResolver</implementation>
<isolated-realm>false</isolated-realm>
<requirements>
<requirement>
@@ -38,7 +38,7 @@
<field-name>delegate</field-name>
</requirement>
<requirement>
- <role>org.apache.geronimo.gshell.artifact.ArtifactRepositoryManager</role>
+ <role>org.apache.geronimo.gshell.artifact.maven.ArtifactRepositoryManager</role>
<field-name>repositoryManager</field-name>
</requirement>
</requirements>
Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/spring/components.xml?rev=719824&r1=719823&r2=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/resources/META-INF/spring/components.xml Fri Nov 21 23:51:05 2008
@@ -25,6 +25,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.ArtifactManagerFactory"/>
+ <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerFactory"/>
</beans>
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest.java&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java Fri Nov 21 23:51:05 2008
@@ -17,22 +17,21 @@
* under the License.
*/
-package org.apache.geronimo.gshell.artifact;
+package org.apache.geronimo.gshell.artifact.maven;
import org.apache.geronimo.gshell.spring.SpringTestSupport;
import org.apache.geronimo.gshell.chronos.StopWatch;
+import org.apache.geronimo.gshell.artifact.maven.ArtifactManager;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.Artifact;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
import java.util.LinkedHashSet;
import java.io.File;
/**
- * Unit tests for the {@link ArtifactManagerFactory} class.
+ * Unit tests for the {@link org.apache.geronimo.gshell.artifact.maven.ArtifactManagerFactory} class.
*
* @version $Rev$ $Date$
*/
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml (from r719823, geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest-context.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml&p1=geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest-context.xml&r1=719823&r2=719824&rev=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/ArtifactManagerFactoryTest-context.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml Fri Nov 21 23:51:05 2008
@@ -25,6 +25,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.ArtifactManagerFactory"/>
+ <bean id="artifactManager" class="org.apache.geronimo.gshell.artifact.maven.ArtifactManagerFactory"/>
</beans>
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/test/resources/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerFactoryTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml?rev=719824&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml Fri Nov 21 23:51:05 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-support</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>gshell-artifact-mercury</artifactId>
+ <name>GShell Support :: Artifact + Mercury</name>
+
+ <description>
+ Provides support for working with artifacts and repositories via Mercury.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact-mercury/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=719824&r1=719823&r2=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Fri Nov 21 23:51:05 2008
@@ -58,6 +58,7 @@
<module>gshell-plexus</module>
<module>gshell-artifact</module>
<module>gshell-artifact-maven</module>
+ <module>gshell-artifact-mercury</module>
<module>gshell-artifact-ivy</module>
<module>gshell-marshal</module>
<module>gshell-xstore</module>
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=719824&r1=719823&r2=719824&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri Nov 21 23:51:05 2008
@@ -257,6 +257,12 @@
<dependency>
<groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact-mercury</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
<artifactId>gshell-artifact-ivy</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>