Author: olamy
Date: Thu Sep 15 19:52:44 2011
New Revision: 1171243
URL: http://svn.apache.org/viewvc?rev=1171243&view=rev
Log:
[MRM-1520] remove duplicate beans : fix for RemoteRepository service
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java?rev=1171243&r1=1171242&r2=1171243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
Thu Sep 15 19:52:44 2011
@@ -28,7 +28,7 @@ import java.io.Serializable;
* @author Olivier Lamy
* @since 1.4
*/
-@XmlRootElement( name = "remoteRepository" )
+@XmlRootElement( name = "repositoryGroup" )
public class RemoteRepository
extends AbstractRepository
implements Serializable
@@ -54,13 +54,13 @@ public class RemoteRepository
}
public RemoteRepository( String id, String name, String url, String
layout, String userName, String password,
- int timeOut )
+ int timeout )
{
super( id, name, layout );
this.url = url;
this.userName = userName;
this.password = password;
- this.timeout = timeOut;
+ this.timeout = timeout;
}
public String getUrl()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java?rev=1171243&r1=1171242&r2=1171243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RemoteRepositoriesService.java
Thu Sep 15 19:52:44 2011
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.api.serv
* under the License.
*/
-import org.apache.archiva.rest.api.model.RemoteRepository;
+import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java?rev=1171243&r1=1171242&r2=1171243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
Thu Sep 15 19:52:44 2011
@@ -19,8 +19,8 @@ package org.apache.archiva.rest.services
*/
import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
-import org.apache.archiva.rest.api.model.RemoteRepository;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
import org.apache.commons.lang.StringUtils;
@@ -109,6 +109,6 @@ public class DefaultRemoteRepositoriesSe
remoteRepository.getLayout(),
remoteRepository.getUserName(),
remoteRepository.getPassword(),
-
remoteRepository.getTimeOut() );
+
remoteRepository.getTimeout() );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java?rev=1171243&r1=1171242&r2=1171243&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
Thu Sep 15 19:52:44 2011
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import org.apache.archiva.rest.api.model.RemoteRepository;
+import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -84,7 +84,7 @@ public class RemoteRepositoriesServiceTe
assertEquals( getRemoteRepository().getLayout(),
service.getRemoteRepository( "id-new" ).getLayout() );
assertEquals( getRemoteRepository().getUserName(),
service.getRemoteRepository( "id-new" ).getUserName() );
assertEquals( getRemoteRepository().getPassword(),
service.getRemoteRepository( "id-new" ).getPassword() );
- assertEquals( getRemoteRepository().getTimeOut(),
service.getRemoteRepository( "id-new" ).getTimeOut() );
+ assertEquals( getRemoteRepository().getTimeout(),
service.getRemoteRepository( "id-new" ).getTimeout() );
assertEquals( initialSize + 1, service.getRemoteRepositories().size()
);
@@ -115,7 +115,7 @@ public class RemoteRepositoriesServiceTe
assertEquals( getRemoteRepository().getLayout(),
service.getRemoteRepository( "id-new" ).getLayout() );
assertEquals( getRemoteRepository().getUserName(),
service.getRemoteRepository( "id-new" ).getUserName() );
assertEquals( getRemoteRepository().getPassword(),
service.getRemoteRepository( "id-new" ).getPassword() );
- assertEquals( getRemoteRepository().getTimeOut(),
service.getRemoteRepository( "id-new" ).getTimeOut() );
+ assertEquals( getRemoteRepository().getTimeout(),
service.getRemoteRepository( "id-new" ).getTimeout() );
assertEquals( initialSize + 1, service.getRemoteRepositories().size()
);
@@ -132,7 +132,7 @@ public class RemoteRepositoriesServiceTe
assertEquals( repo.getLayout(), service.getRemoteRepository( "id-new"
).getLayout() );
assertEquals( repo.getUserName(), service.getRemoteRepository(
"id-new" ).getUserName() );
assertEquals( repo.getPassword(), service.getRemoteRepository(
"id-new" ).getPassword() );
- assertEquals( repo.getTimeOut(), service.getRemoteRepository( "id-new"
).getTimeOut() );
+ assertEquals( repo.getTimeout(), service.getRemoteRepository( "id-new"
).getTimeout() );
service.deleteRemoteRepository( "id-new" );
