You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/11/08 03:47:30 UTC
svn commit: r712345 - in /maven/mercury/trunk:
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/
mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/
mercury-maven/ mercury-maven/mercury-compare-plugin/ mercury-maven/merc...
Author: ogusakov
Date: Fri Nov 7 18:47:29 2008
New Revision: 712345
URL: http://svn.apache.org/viewvc?rev=712345&view=rev
Log:
added more helper types
Added:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java
maven/mercury/trunk/mercury-maven/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.classpath
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.project
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.eclipse.jdt.core.prefs
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.maven.ide.eclipse.prefs
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.java
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/resources/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/resources/META-INF/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/index.apt
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/site.xml
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/test/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/test/java/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/test/resources/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/crypto/
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.class (with props)
maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/test-classes/
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java Fri Nov 7 18:47:29 2008
@@ -0,0 +1,40 @@
+package org.apache.maven.mercury.artifact;
+
+import java.util.Collection;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class ArtifactExclusionList
+ extends ArtifactMetadataList
+{
+
+ /**
+ * @param md
+ */
+ public ArtifactExclusionList( ArtifactBasicMetadata... md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param md
+ */
+ public ArtifactExclusionList( Collection<ArtifactBasicMetadata> md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param mds
+ */
+ public ArtifactExclusionList( String... mds )
+ {
+ super( mds );
+ }
+
+}
Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java Fri Nov 7 18:47:29 2008
@@ -0,0 +1,40 @@
+package org.apache.maven.mercury.artifact;
+
+import java.util.Collection;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class ArtifactInclusionList
+ extends ArtifactMetadataList
+{
+
+ /**
+ * @param md
+ */
+ public ArtifactInclusionList( ArtifactBasicMetadata... md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param md
+ */
+ public ArtifactInclusionList( Collection<ArtifactBasicMetadata> md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param mds
+ */
+ public ArtifactInclusionList( String... mds )
+ {
+ super( mds );
+ }
+
+}
Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java?rev=712345&r1=712344&r2=712345&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java Fri Nov 7 18:47:29 2008
@@ -11,7 +11,7 @@
* @version $Id$
*
*/
-public class ArtifactMetadataList
+public abstract class ArtifactMetadataList
{
List<ArtifactBasicMetadata> _artifacts = new ArrayList<ArtifactBasicMetadata>(8);
Added: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java Fri Nov 7 18:47:29 2008
@@ -0,0 +1,40 @@
+package org.apache.maven.mercury.artifact;
+
+import java.util.Collection;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class ArtifactQueryList
+ extends ArtifactMetadataList
+{
+
+ /**
+ * @param md
+ */
+ public ArtifactQueryList( ArtifactBasicMetadata... md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param md
+ */
+ public ArtifactQueryList( Collection<ArtifactBasicMetadata> md )
+ {
+ super( md );
+ }
+
+ /**
+ * @param mds
+ */
+ public ArtifactQueryList( String... mds )
+ {
+ super( mds );
+ }
+
+}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=712345&r1=712344&r2=712345&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Fri Nov 7 18:47:29 2008
@@ -22,7 +22,6 @@
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.api.RepositoryUpdateIntervalPolicy;
-import org.apache.maven.mercury.repository.api.RepositoryUpdatePolicy;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.repository.virtual.VirtualRepositoryReader;
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.classpath
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.classpath?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.classpath (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.classpath Fri Nov 7 18:47:29 2008
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.project
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.project?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.project (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.project Fri Nov 7 18:47:29 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>mercury-compare-plugin</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.eclipse.jdt.core.prefs?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.eclipse.jdt.core.prefs Fri Nov 7 18:47:29 2008
@@ -0,0 +1,5 @@
+#Fri Nov 07 14:24:12 PST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.maven.ide.eclipse.prefs
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.maven.ide.eclipse.prefs?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.maven.ide.eclipse.prefs (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/.settings/org.maven.ide.eclipse.prefs Fri Nov 7 18:47:29 2008
@@ -0,0 +1,8 @@
+#Fri Nov 07 14:24:11 PST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/pom.xml?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/pom.xml (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/pom.xml Fri Nov 7 18:47:29 2008
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.sonatype.maven.plugins</groupId>
+ <artifactId>mercury-compare-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Mercury Maven resolusion comparisson</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>Mercury Maven resolusion comparisson</description>
+ <prerequisites />
+ <inceptionYear>2008</inceptionYear>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <developers>
+ <developer>
+ <name>Oleg Gusakov</name>
+ <email>ogusakov@apache.org</email>
+ <roles>
+ <role>jack-of-all-trades</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ </developers>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>3.0-alpha-1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
+
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.java?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.java (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/main/java/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.java Fri Nov 7 18:47:29 2008
@@ -0,0 +1,88 @@
+package org.sonatype.maven.plugins.crypto;
+
+import org.apache.maven.artifact.manager.CredentialsChangeRequest;
+import org.apache.maven.artifact.manager.CredentialsDataSource;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.codehaus.plexus.components.interactivity.Prompter;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ *
+ * @author Oleg Gusakov
+ *
+ * @goal compare
+ * @requiresProject false
+ */
+
+public class MercuryCompareMojo
+extends AbstractMojo
+implements Initializable
+{
+ private static Log _log;
+ //----------------------------------------------------------------
+ /**
+ * @parameter expression="${listFile}"
+ */
+ String listFile;
+ /**
+ * @parameter expression="${session}"
+ */
+ MavenSession _session;
+//
+// /**
+// * @parameter expression="${project}"
+// */
+// MavenProject _project;
+//
+// /**
+// * @component
+// */
+// Prompter _prompter;
+ //----------------------------------------------------------------
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ try {
+
+ if( _session == null )
+ throw new Exception("session not injected");
+
+_log.info("\n------------------------------->");
+
+ AuthenticationInfo auth = new AuthenticationInfo();
+ auth.setUserName(username);
+ auth.setPassword(password);
+_log.info("Auth = "+auth);
+
+ CredentialsChangeRequest req = new CredentialsChangeRequest( serverid, auth, oldpassword);
+_log.info("Req = "+req);
+ CredentialsDataSource cds = (CredentialsDataSource) _session.getContainer().lookup(CredentialsDataSource.class);
+_log.info("Cds = "+cds);
+ cds.set(req);
+
+_log.info("Password for "+serverid+" succesfully "+(oldpassword==null?"set":"reset") );
+
+ } catch( Exception e ) {
+ _log.error("Error setting password for "+serverid+": "+e.getMessage() );
+ throw new MojoExecutionException( e.getMessage() );
+ }
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ _log = getLog();
+ }
+
+ //----------------------------------------------------------------
+ //----------------------------------------------------------------
+}
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/index.apt?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/index.apt (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/apt/index.apt Fri Nov 7 18:47:29 2008
@@ -0,0 +1,26 @@
+ ------
+ Introduction
+ ------
+ ------
+ $Id: index.apt 5047 2007-08-21 18:17:49Z user57 $
+
+~~
+~~ Copyright (C) 2006-2007 the original author or authors.
+~~
+~~ Licensed 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.
+~~
+
+Example Groovy Module
+
+ This is an exmaple of a Maven 2 module implemented in Groovy.
+
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/site.xml?rev=712345&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/site.xml (added)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-plugin/src/site/site.xml Fri Nov 7 18:47:29 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2006-2007 the original author or authors.
+
+ Licensed 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.
+-->
+
+<!-- $Id$ -->
+
+<project name="Maven Cryptography Helper plugin">
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+ ${reports}
+ </body>
+</project>
+
Added: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.class
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.class?rev=712345&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/mercury/trunk/mercury-maven/mercury-compare-plugin/target/classes/org/sonatype/maven/plugins/crypto/MercuryCompareMojo.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=712345&r1=712344&r2=712345&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Fri Nov 7 18:47:29 2008
@@ -13,8 +13,11 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactExclusionList;
+import org.apache.maven.mercury.artifact.ArtifactInclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadataList;
+import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
@@ -214,9 +217,9 @@
//---------------------------------------------------------------
public List<ArtifactMetadata> resolve( List<Repository> repos
, ArtifactScopeEnum scope
- , ArtifactMetadataList artifacts
- , ArtifactMetadataList inclusions
- , ArtifactMetadataList exclusions
+ , ArtifactQueryList artifacts
+ , ArtifactInclusionList inclusions
+ , ArtifactExclusionList exclusions
)
throws RepositoryException
{
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=712345&r1=712344&r2=712345&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java Fri Nov 7 18:47:29 2008
@@ -9,8 +9,11 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactExclusionList;
+import org.apache.maven.mercury.artifact.ArtifactInclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadataList;
+import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
@@ -152,9 +155,9 @@
*/
public List<ArtifactMetadata> resolve( List<Repository> repos
, ArtifactScopeEnum scope
- , ArtifactMetadataList artifacts
- , ArtifactMetadataList inclusions
- , ArtifactMetadataList exclusions
+ , ArtifactQueryList artifacts
+ , ArtifactInclusionList inclusions
+ , ArtifactExclusionList exclusions
)
throws RepositoryException;
}
Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=712345&r1=712344&r2=712345&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Fri Nov 7 18:47:29 2008
@@ -11,8 +11,10 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactExclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadataList;
+import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -176,7 +178,7 @@
String artifactId = "asm:asm-xml:3.0";
- List<ArtifactMetadata> res = pm.resolve( repos, ArtifactScopeEnum.compile, new ArtifactMetadataList(artifactId), null, null );
+ List<ArtifactMetadata> res = pm.resolve( repos, ArtifactScopeEnum.compile, new ArtifactQueryList(artifactId), null, null );
System.out.println("Resolved as "+res);
@@ -202,9 +204,9 @@
List<ArtifactMetadata> res = pm.resolve( repos
, ArtifactScopeEnum.compile
- , new ArtifactMetadataList(artifactId)
+ , new ArtifactQueryList(artifactId)
, null
- , new ArtifactMetadataList("asm:asm:3.0")
+ , new ArtifactExclusionList("asm:asm:3.0")
);
System.out.println("Resolved as "+res);