Author: olamy
Date: Fri Sep 2 15:54:35 2011
New Revision: 1164590
URL: http://svn.apache.org/viewvc?rev=1164590&view=rev
Log:
[MRM-1506] api to configure RemoteRepository : implement get methods
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java?rev=1164590&r1=1164589&r2=1164590&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java
Fri Sep 2 15:54:35 2011
@@ -32,28 +32,88 @@ public class RemoteRepository
implements Serializable
{
- private String location;
+ private String url;
+
+ private String userName;
+
+ private String password;
+
+ private int timeout = 60;
public RemoteRepository()
{
// no op
}
- public RemoteRepository( String id, String name, String location, String
layout )
+ public RemoteRepository( String id, String name, String url, String layout
)
+ {
+ super( id, name, layout );
+ this.url = url;
+ }
+
+ public RemoteRepository( String id, String name, String url, String
layout, String userName, String password,
+ int timeOut )
{
super( id, name, layout );
- this.location = location;
+ this.url = url;
+ this.userName = userName;
+ this.password = password;
+ this.timeout = timeOut;
+ }
+
+ public String getUrl()
+ {
+ return url;
+ }
+
+ public void setUrl( String url )
+ {
+ this.url = url;
+ }
+
+ public String getUserName()
+ {
+ return userName;
}
+ public void setUserName( String userName )
+ {
+ this.userName = userName;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword( String password )
+ {
+ this.password = password;
+ }
+
+ public int getTimeout()
+ {
+ return timeout;
+ }
+
+ public void setTimeout( int timeout )
+ {
+ this.timeout = timeout;
+ }
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder();
sb.append( "RemoteRepository" );
- sb.append( "{location='" ).append( location ).append( '\'' );
+ sb.append( "{url='" ).append( url ).append( '\'' );
+ sb.append( ", userName='" ).append( userName ).append( '\'' );
+ sb.append( ", password='" ).append( password ).append( '\'' );
+ sb.append( ", timeout=" ).append( timeout );
sb.append( '}' );
sb.append( super.toString() );
return sb.toString();
}
+
+
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdmin.java?rev=1164590&r1=1164589&r2=1164590&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdmin.java
Fri Sep 2 15:54:35 2011
@@ -41,7 +41,6 @@ public interface RemoteRepositoryAdmin
Boolean addRemoteRepository( RemoteRepository remoteRepository )
throws RepositoryAdminException;
-
Boolean updateRemoteRepository( RemoteRepository remoteRepository )
throws RepositoryAdminException;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java?rev=1164590&r1=1164589&r2=1164590&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java
Fri Sep 2 15:54:35 2011
@@ -34,8 +34,6 @@ import java.io.IOException;
* AddRemoteRepositoryAction
*
* @version $Id$
- * <p/>
- * plexus.component role="com.opensymphony.xwork2.Action"
role-hint="addRemoteRepositoryAction" instantiation-strategy="per-lookup"
*/
@Controller( "addRemoteRepositoryAction" )
@Scope( "prototype" )
