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 2009/02/12 23:07:24 UTC
svn commit: r743901 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-0553/test-1/
resources/mng-0553/test-2/
Author: ogusakov
Date: Thu Feb 12 22:07:23 2009
New Revision: 743901
URL: http://svn.apache.org/viewvc?rev=743901&view=rev
Log:
[MNG-553] security dispatcher design changed
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=743901&r1=743900&r2=743901&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java Thu Feb 12 22:07:23 2009
@@ -51,7 +51,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
- verifier.getSystemProperties().setProperty( "maven.sec.path", "settings-security.xml" );
+ verifier.getSystemProperties().setProperty( "settings.security", "settings-security.xml" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -85,7 +85,7 @@
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
- verifier.getSystemProperties().setProperty( "maven.sec.path", "settings~security.xml" );
+ verifier.getSystemProperties().setProperty( "settings.security", "settings~security.xml" );
verifier.setCliOptions( cliOptions );
// NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
verifier.executeGoal( "validate", Collections.singletonMap( "MAVEN_OPTS", "-Duser.language=tr" ) );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml?rev=743901&r1=743900&r2=743901&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml Thu Feb 12 22:07:23 2009
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<settingsSecurity>
- <master>{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}</master>
+ <master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
</settingsSecurity>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml?rev=743901&r1=743900&r2=743901&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings.xml Thu Feb 12 22:07:23 2009
@@ -24,7 +24,7 @@
<server>
<id>test</id>
<username>testuser</username>
- <password>{8+qG0C/CnRsH+45rqY50rWb1cMILU4zu9K/sZ8omYzs=}</password>
+ <password>{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}</password>
</server>
</servers>
</settings>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml?rev=743901&r1=743900&r2=743901&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/relocated-settings-security.xml Thu Feb 12 22:07:23 2009
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<settingsSecurity>
- <master>{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}</master>
+ <master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
</settingsSecurity>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml?rev=743901&r1=743900&r2=743901&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-2/settings.xml Thu Feb 12 22:07:23 2009
@@ -24,7 +24,7 @@
<server>
<id>test</id>
<username>testuser</username>
- <password>{8+qG0C/CnRsH+45rqY50rWb1cMILU4zu9K/sZ8omYzs=}</password>
+ <password>{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}</password>
</server>
</servers>
</settings>