maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r759505 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-2387/
Date Sat, 28 Mar 2009 16:38:59 GMT
Author: bentmann
Date: Sat Mar 28 16:38:58 2009
New Revision: 759505

URL: http://svn.apache.org/viewvc?rev=759505&view=rev
Log:
o Moved repository declarations to settings

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom.xml
      - copied, changed from r758432, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom-unfiltered.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml
      - copied, changed from r758432, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings.xml
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom-unfiltered.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings.xml
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java?rev=759505&r1=759504&r2=759505&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
Sat Mar 28 16:38:58 2009
@@ -47,7 +47,6 @@
 
     public MavenITmng2387InactiveProxyTest()
     {
-        // TODO: re-instate feature in 3.0
         super( "[2.0.11,2.1.0-M1),[2.1.0,)" ); // 2.0.11+, 2.1.0+
     }
 
@@ -78,10 +77,9 @@
     }
 
     /**
-     * Test that mirror definitions are properly evaluated. In particular, the first matching
mirror definition
-     * from the settings should win, i.e. ordering of mirror definitions matters.
+     * Test that no proxy is used if none of the configured proxies is actually set as active.
      */
-    public void testitFirstMatchWins()
+    public void testit()
         throws Exception
     {
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
@@ -89,7 +87,7 @@
         Properties properties = verifier.newDefaultFilterProperties();        
         properties.setProperty( "@host@", InetAddress.getLocalHost().getCanonicalHostName()
);
         properties.setProperty( "@port@", Integer.toString( port ) );
-        verifier.filterFile( "pom-unfiltered.xml", "pom.xml", "UTF-8", properties );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties
);
 
         verifier.setAutoclean( false );
         verifier.deleteArtifacts( "org.apache.maven.its.mng2387" );

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom.xml
(from r758432, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom-unfiltered.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom-unfiltered.xml&r1=758432&r2=759505&rev=759505&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom-unfiltered.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/pom.xml
Sat Mar 28 16:38:58 2009
@@ -28,32 +28,17 @@
 
   <name>Maven Integration Test :: MNG-2387</name> 
   <description>
-    Test that mirror definitions are properly evaluated. In particular, the first matching
mirror definition
-    from the settings should win, i.e. ordering of mirror definitions matters.
+    Test that no proxy is used if none of the configured proxies is actually set as active.
   </description>
 
   <dependencies>
     <dependency>
-      <!-- Provided by repo maven-core-it-a and only this repo -->
       <groupId>org.apache.maven.its.mng2387</groupId>
       <artifactId>a</artifactId>
       <version>0.1</version>
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>http://@host@:@port@/</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml
(from r758432, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings.xml&r1=758432&r2=759505&rev=759505&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2387/settings-template.xml
Sat Mar 28 16:38:58 2009
@@ -22,10 +22,31 @@
 <settings>
   <proxies>
     <proxy>
+      <!-- NOTE: Set as inactive so should not be used, even if the one and only proxy
configured -->
       <active>false</active>
       <protocol>http</protocol>
       <host>localhost</host>
       <port>0</port>
     </proxy>
   </proxies>
+  <profiles>
+    <profile>
+      <id>maven-core-it</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <url>http://@host@:@port@/</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
 </settings>



Mime
View raw message