You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/09 14:51:24 UTC
svn commit: r733038 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3461/ resources/mng-3461/test-1/
resources/mng-3461/test-1/repo/ resources/mng-3461/test-1/repo/org/
resources/mng-3461/test-...
Author: bentmann
Date: Fri Jan 9 05:51:23 2009
New Revision: 733038
URL: http://svn.apache.org/viewvc?rev=733038&view=rev
Log:
[MNG-3461] Enhance Mirror definition syntax
o Added first bits of an IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=733038&r1=733037&r2=733038&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Fri Jan 9 05:51:23 2009
@@ -167,6 +167,7 @@
suite.addTestSuite( MavenITmng3485OverrideWagonExtensionTest.class );
suite.addTestSuite( MavenITmng3482DependencyPomInterpolationTest.class );
suite.addTestSuite( MavenITmng3475BaseAlignedDirTest.class );
+ suite.addTestSuite( MavenITmng3461MirrorMatchingTest.class );
suite.addTestSuite( MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.class );
suite.addTestSuite( MavenITmng3428PluginDescriptorArtifactsIncompleteTest.class );
suite.addTestSuite( MavenITmng3415JunkRepositoryMetadataTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java Fri Jan 9 05:51:23 2009
@@ -0,0 +1,138 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.Request;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.handler.AbstractHandler;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3461">MNG-3461</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3461MirrorMatchingTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng3461MirrorMatchingTest()
+ {
+ super( "(2.0.8,)" );
+ }
+
+ /**
+ * Test that mirror definitions are properly evaluated. In particular, an exact match by id should always
+ * win over wildcard matches.
+ */
+ public void testitExactMatchDominatesWildcard()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-1" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
+ }
+
+ /**
+ * Test that mirror definitions are properly evaluated. In particular, the wildcard external:* should not
+ * match file:// and localhost repos but only external repos.
+ */
+ public void testitExternalWildcard()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-2" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ Handler repoHandler = new AbstractHandler()
+ {
+ public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch )
+ throws IOException, ServletException
+ {
+ System.out.println( "Handling " + request.getMethod() + " " + request.getRequestURL() );
+
+ if ( request.getRequestURI().endsWith( "/b-0.1.jar" ) )
+ {
+ response.setStatus( HttpServletResponse.SC_OK );
+ response.getWriter().println( request.getRequestURI() );
+ }
+ else
+ {
+ response.setStatus( HttpServletResponse.SC_NOT_FOUND );
+ }
+
+ ( (Request) request ).setHandled( true );
+ }
+ };
+
+ Server server = new Server( 0 );
+ server.setHandler( repoHandler );
+ server.start();
+
+ try
+ {
+ int port = server.getConnectors()[0].getLocalPort();
+
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ filterProps.setProperty( "@test.port@", Integer.toString( port ) );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+ finally
+ {
+ server.stop();
+ }
+
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "b", "0.1", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "c", "0.1", "jar" );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>test-1</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-3461</name>
+ <description>
+ Test that mirror definitions are properly evaluated. In particular, an exact match by id should always
+ win over wildcard matches.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>http://maven.apache.org/null</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar?rev=733038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom Fri Jan 9 05:51:23 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090109112621</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<settings>
+ <mirrors>
+ <mirror>
+ <id>test-a</id>
+ <url>@baseurl@/null0</url>
+ <mirrorOf>external:*</mirrorOf>
+ </mirror>
+ <mirror>
+ <id>test-b</id>
+ <url>@baseurl@/repo</url>
+ <mirrorOf>maven-core-it</mirrorOf>
+ </mirror>
+ <mirror>
+ <id>test-c</id>
+ <url>@baseurl@/null1</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,104 @@
+<?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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>test-3</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-3461</name>
+ <description>
+ Test that mirror definitions are properly evaluated. In particular, the wildcard external:* should not
+ match file:// and localhost repos but only external repos.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it-file</id>
+ <url>@baseurl@/repo-1</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>maven-core-it-localhost</id>
+ <url>http://localhost:@test.port@/repo-2</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>maven-core-it-ext</id>
+ <url>http://maven.apache.org/null</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/pom-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar?rev=733038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom Fri Jan 9 05:51:23 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090109112621</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-1/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.jar?rev=733038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.pom?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/0.1/c-0.1.pom Fri Jan 9 05:51:23 2009
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>c</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090109131204</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/repo-3/org/apache/maven/its/mng3461/c/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml?rev=733038&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml Fri Jan 9 05:51:23 2009
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<settings>
+ <mirrors>
+ <mirror>
+ <id>test-a</id>
+ <url>@baseurl@/repo-3</url>
+ <mirrorOf>external:*</mirrorOf>
+ </mirror>
+ </mirrors>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-2/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision