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/09 23:14:31 UTC
svn commit: r742771 - in /maven/components/branches/maven-2.1.x:
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven-core/src/main/resources/META-INF/plexus/components.xml pom.xml
Author: ogusakov
Date: Mon Feb 9 22:14:30 2009
New Revision: 742771
URL: http://svn.apache.org/viewvc?rev=742771&view=rev
Log:
[MNG-553] - made security dispatcher more flexible by moving initial location of the settings-security.xml into configuration
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-2.1.x/pom.xml
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=742771&r1=742770&r2=742771&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Feb 9 22:14:30 2009
@@ -666,11 +666,11 @@
try
{
- sd = (SecDispatcher) container.lookup( SecDispatcher.ROLE );
+ sd = (SecDispatcher) container.lookup( SecDispatcher.ROLE, "maven" );
}
catch (Exception e)
{
- getLogger().warn( "security features are disabled. Cannot find plexus component "+SecDispatcher.ROLE );
+ getLogger().warn( "security features are disabled. Cannot find plexus component "+SecDispatcher.ROLE +":maven");
line();
}
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=742771&r1=742770&r2=742771&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Feb 9 22:14:30 2009
@@ -603,6 +603,21 @@
</requirement>
</requirements>
</component>
-
+
+ <component>
+ <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
+ <role-hint>maven</role-hint>
+ <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
+ <description>Maven Security dispatcher</description>
+ <requirements>
+ <requirement>
+ <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
+ <field-name>_cipher</field-name>
+ </requirement>
+ </requirements>
+ <configuration>
+ <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
+ </configuration>
+ </component>
</components>
</component-set>
Modified: maven/components/branches/maven-2.1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=742771&r1=742770&r2=742771&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Mon Feb 9 22:14:30 2009
@@ -399,7 +399,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-alpha-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>