Author: jvanzyl
Date: Thu Mar 22 09:49:57 2007
New Revision: 521340
URL: http://svn.apache.org/viewvc?view=rev&rev=521340
Log:
o fixing default perms for deployment
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?view=diff&rev=521340&r1=521339&r2=521340
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Thu Mar 22 09:49:57 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+ package org.apache.maven.artifact.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -74,7 +74,7 @@
// TODO: proxies, authentication and mirrors are via settings, and should
come in via an alternate method - perhaps
// attached to ArtifactRepository before the method is called (so AR would
be composed of WR, not inherit it)
private Map proxies = new HashMap();
-
+
private Map authenticationInfoMap = new HashMap();
private Map serverPermissionsMap = new HashMap();
@@ -96,6 +96,8 @@
private Map availableWagons = new HashMap();
+ private RepositoryPermissions defaultRepositoryPermissions;
+
// TODO: this leaks the component in the public api - it is never released
back to the container
public Wagon getWagon( Repository repository )
throws UnsupportedProtocolException, WagonConfigurationException
@@ -209,8 +211,10 @@
if ( serverPermissionsMap.containsKey( repository.getId() ) )
{
RepositoryPermissions perms = (RepositoryPermissions)
serverPermissionsMap.get( repository.getId() );
+
getLogger().debug(
"adding permissions to wagon connection: " +
perms.getFileMode() + " " + perms.getDirectoryMode() );
+
artifactRepository.setPermissions( perms );
}
else
@@ -744,8 +748,8 @@
public void addPermissionInfo( String repositoryId, String
filePermissions, String directoryPermissions )
{
-
RepositoryPermissions permissions = new RepositoryPermissions();
+
boolean addPermissions = false;
if ( filePermissions != null )
@@ -871,4 +875,8 @@
serverConfigurationMap.put( repositoryId, xmlConf );
}
+ public void setDefaultRepositoryPermissions( RepositoryPermissions
defaultRepositoryPermissions )
+ {
+ this.defaultRepositoryPermissions = defaultRepositoryPermissions;
+ }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?view=diff&rev=521340&r1=521339&r2=521340
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
Thu Mar 22 09:49:57 2007
@@ -30,6 +30,7 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -118,5 +119,7 @@
void registerWagons( Collection wagons, PlexusContainer extensionContainer
);
- void findAndRegisterWagons( PlexusContainer container );
+ void findAndRegisterWagons( PlexusContainer container );
+
+ void setDefaultRepositoryPermissions( RepositoryPermissions permissions );
}
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=521340&r1=521339&r2=521340
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
Thu Mar 22 09:49:57 2007
@@ -20,6 +20,7 @@
*/
import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -179,14 +180,22 @@
wagonManager.addAuthenticationInfo( server.getId(),
server.getUsername(), server.getPassword(),
server.getPrivateKey(),
server.getPassphrase() );
- wagonManager.addPermissionInfo( server.getId(),
server.getFilePermissions(),
-
server.getDirectoryPermissions() );
+ wagonManager.addPermissionInfo( server.getId(),
server.getFilePermissions(), server.getDirectoryPermissions() );
if ( server.getConfiguration() != null )
{
wagonManager.addConfiguration( server.getId(), (Xpp3Dom)
server.getConfiguration() );
}
}
+
+ RepositoryPermissions defaultPermissions = new
RepositoryPermissions();
+
+
+ defaultPermissions.setDirectoryMode( "775" );
+
+ defaultPermissions.setFileMode( "664" );
+
+ wagonManager.setDefaultRepositoryPermissions( defaultPermissions );
for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
{
