Author: joakime
Date: Tue Oct 2 11:00:48 2007
New Revision: 581324
URL: http://svn.apache.org/viewvc?rev=581324&view=rev
Log:
[MRM-513] Support remote repositories with passwords.
Commited patch from James William Dumay.
Updated title/h1 sections of add/edit/delete jsps to be consistent with regards
to "remote" and "managed" usage.
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Tue Oct 2 11:00:48 2007
@@ -273,6 +273,22 @@
<description>
The URL for this repository.
</description>
+ </field>
+ <field>
+ <name>username</name>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <description>
+ The Username for this repository.
+ </description>
+ </field>
+ <field>
+ <name>password</name>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <description>
+ The Password for this repository.
+ </description>
</field>
</fields>
</class>
Modified:
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
Tue Oct 2 11:00:48 2007
@@ -28,7 +28,7 @@
public class ArchivaRepository
{
private ArchivaRepositoryModel model;
-
+
private RepositoryURL url;
protected boolean blacklisted;
@@ -77,6 +77,16 @@
{
return this.url;
}
+
+ public void setUsername(String username)
+ {
+ this.model.setRepositoryUsername(username);
+ }
+
+ public void setPassword(String password)
+ {
+ this.model.setRepositoryPassword(password);
+ }
public ArchivaRepositoryModel getModel()
{
@@ -101,6 +111,16 @@
public String getName()
{
return this.model.getName();
+ }
+
+ public String getUsername()
+ {
+ return model.getRepositoryUsername();
+ }
+
+ public String getPassword()
+ {
+ return model.getRepositoryPassword();
}
public String toString()
Modified:
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
Tue Oct 2 11:00:48 2007
@@ -132,6 +132,24 @@
The URL of the repository.
</description>
</field>
+ <field stash.maxSize="250">
+ <name>repositoryUsername</name>
+ <identifier>false</identifier>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <description>
+ The Username of the repository.
+ </description>
+ </field>
+ <field stash.maxSize="250">
+ <name>repositoryPassword</name>
+ <identifier>false</identifier>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <description>
+ The Password of the repository.
+ </description>
+ </field>
<field stash.maxSize="20">
<name>creationSource</name>
<identifier>false</identifier>
Modified:
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Tue Oct 2 11:00:48 2007
@@ -45,6 +45,7 @@
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.WagonException;
import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -441,7 +442,8 @@
transferChecksum( wagon, remoteRepository, remotePath,
localFile, ".sha1" );
transferChecksum( wagon, remoteRepository, remotePath,
localFile, ".md5" );
- }
+
+ }
}
catch ( ResourceDoesNotExistException e )
{
@@ -691,15 +693,31 @@
try
{
+ AuthenticationInfo authInfo = null;
+ String username = remoteRepository.getUsername();
+ String password = remoteRepository.getPassword();
+ if (username != null && password != null)
+ {
+ getLogger().info("Using username " + username + " to
connect to remote repository "
+ + remoteRepository.getUrl());
+ authInfo = new AuthenticationInfo();
+ authInfo.setUserName(username);
+ authInfo.setPassword(password);
+ }
+ else
+ {
+ getLogger().info("No authentication for remote
repository needed");
+ }
+
Repository wagonRepository =
new Repository( remoteRepository.getId(),
remoteRepository.getUrl().toString() );
if ( networkProxy != null )
{
- wagon.connect( wagonRepository, networkProxy );
+ wagon.connect( wagonRepository, authInfo, networkProxy );
}
else
{
- wagon.connect( wagonRepository );
+ wagon.connect( wagonRepository, authInfo );
}
connected = true;
}
@@ -871,6 +889,8 @@
ArchivaRepository repo = new ArchivaRepository( repoConfig.getId(),
repoConfig.getName(), repoConfig.getUrl() );
repo.getModel().setLayoutName( repoConfig.getLayout() );
+ repo.setUsername(repoConfig.getUsername());
+ repo.setPassword(repoConfig.getPassword());
return repo;
}
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
Tue Oct 2 11:00:48 2007
@@ -21,17 +21,15 @@
<html>
<head>
- <title>Admin: Add Repository</title>
+ <title>Admin: Add Remote Repository</title>
<ww:head/>
</head>
<body>
-<h1>Admin: Add Repository</h1>
+<h1>Admin: Add Remote Repository</h1>
<div id="contentArea">
-
- <h2>Add Repository</h2>
<ww:actionmessage/>
<ww:form method="post" action="addRemoteRepository!commit"
namespace="/admin" validate="true">
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
Tue Oct 2 11:00:48 2007
@@ -21,17 +21,15 @@
<html>
<head>
- <title>Admin: Add Repository</title>
+ <title>Admin: Add Managed Repository</title>
<ww:head/>
</head>
<body>
-<h1>Admin: Add Repository</h1>
+<h1>Admin: Add Managed Repository</h1>
<div id="contentArea">
-
- <h2>Add Repository</h2>
<ww:actionmessage/>
<ww:form method="post" action="addRepository!commit" namespace="/admin"
validate="true">
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
Tue Oct 2 11:00:48 2007
@@ -21,19 +21,17 @@
<html>
<head>
- <title>Admin: Edit Repository</title>
+ <title>Admin: Edit Remote Repository</title>
<ww:head/>
</head>
<body>
-<h1>Admin: Edit Repository</h1>
+<h1>Admin: Edit Remote Repository</h1>
<ww:actionerror/>
<div id="contentArea">
-
- <h2>Edit Repository</h2>
<ww:actionmessage/>
<ww:form method="post" action="editRemoteRepository!commit"
namespace="/admin" validate="false">
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
Tue Oct 2 11:00:48 2007
@@ -21,19 +21,17 @@
<html>
<head>
- <title>Admin: Edit Repository</title>
+ <title>Admin: Edit Managed Repository</title>
<ww:head/>
</head>
<body>
-<h1>Admin: Edit Repository</h1>
+<h1>Admin: Edit Managed Repository</h1>
<ww:actionerror/>
<div id="contentArea">
-
- <h2>Edit Repository</h2>
<ww:actionmessage/>
<ww:form method="post" action="editRepository!commit" namespace="/admin"
validate="false">
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=581324&r1=581323&r2=581324&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
Tue Oct 2 11:00:48 2007
@@ -21,5 +21,7 @@
<ww:textfield name="repository.name" label="Name" size="50" required="true"/>
<ww:textfield name="repository.url" label="URL" size="50" required="true"/>
+<ww:textfield name="repository.username" label="Username" size="25"
required="false"/>
+<ww:password name="repository.password" label="Password" size="25"
required="false"/>
<ww:select list="[EMAIL PROTECTED]@{'default' : 'Maven 2.x Repository',
'legacy' : 'Maven 1.x Repository'}"
name="repository.layout" label="Type"/>
