Author: olamy
Date: Wed Sep 7 11:41:15 2011
New Revision: 1166130
URL: http://svn.apache.org/viewvc?rev=1166130&view=rev
Log:
MRM-1507 : api to configure ProxyConnector
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
Wed Sep 7 11:41:15 2011
@@ -87,12 +87,6 @@ public abstract class AbstractRepository
}
}
- protected List<ProxyConnectorConfiguration> getProxyConnectors()
- {
- return new ArrayList<ProxyConnectorConfiguration>(
- archivaConfiguration.getConfiguration().getProxyConnectors() );
- }
-
public List<AuditListener> getAuditListeners()
{
return auditListeners;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.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/DefaultRemoteRepositoryAdmin.java?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
Wed Sep 7 11:41:15 2011
@@ -113,8 +113,9 @@ public class DefaultRemoteRepositoryAdmi
configuration.removeRemoteRepository( remoteRepositoryConfiguration );
+ // TODO use ProxyConnectorAdmin interface ?
// [MRM-520] Proxy Connectors are not deleted with the deletion of a
Repository.
- List<ProxyConnectorConfiguration> proxyConnectors =
getProxyConnectors();
+ List<ProxyConnectorConfiguration> proxyConnectors =
configuration.getProxyConnectors();
for ( ProxyConnectorConfiguration proxyConnector : proxyConnectors )
{
if ( StringUtils.equals( proxyConnector.getTargetRepoId(),
repositoryId ) )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
Wed Sep 7 11:41:15 2011
@@ -23,6 +23,8 @@ import org.apache.archiva.admin.AuditInf
import org.apache.archiva.admin.mock.MockAuditListener;
import org.apache.archiva.admin.repository.managed.ManagedRepository;
import org.apache.archiva.admin.repository.managed.ManagedRepositoryAdmin;
+import org.apache.archiva.admin.repository.proxyconnector.ProxyConnectorAdmin;
+import org.apache.archiva.admin.repository.remote.RemoteRepository;
import org.apache.archiva.admin.repository.remote.RemoteRepositoryAdmin;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
@@ -63,6 +65,9 @@ public abstract class AbstractRepository
@Inject
protected ManagedRepositoryAdmin managedRepositoryAdmin;
+ @Inject
+ protected ProxyConnectorAdmin proxyConnectorAdmin;
+
protected AuditInformation getFakeAuditInformation()
{
AuditInformation auditInformation = new AuditInformation(
getFakeUser(), "archiva-localhost" );
@@ -115,4 +120,21 @@ public abstract class AbstractRepository
}
return null;
}
+
+ protected RemoteRepository getRemoteRepository()
+ {
+ return getRemoteRepository( "foo" );
+ }
+
+ protected RemoteRepository getRemoteRepository(String id)
+ {
+ RemoteRepository remoteRepository = new RemoteRepository();
+ remoteRepository.setUrl( "http://foo.com/maven-it-rocks"; );
+ remoteRepository.setTimeout( 10 );
+ remoteRepository.setName( "maven foo" );
+ remoteRepository.setUserName( "foo-name" );
+ remoteRepository.setPassword( "toto" );
+ remoteRepository.setId( id );
+ return remoteRepository;
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
Wed Sep 7 11:41:15 2011
@@ -149,15 +149,5 @@ public class RemoteRepositoryAdminTest
}
- private RemoteRepository getRemoteRepository()
- {
- RemoteRepository remoteRepository = new RemoteRepository();
- remoteRepository.setUrl( "http://foo.com/maven-it-rocks"; );
- remoteRepository.setTimeout( 10 );
- remoteRepository.setName( "maven foo" );
- remoteRepository.setUserName( "foo-name" );
- remoteRepository.setPassword( "toto" );
- remoteRepository.setId( "foo" );
- return remoteRepository;
- }
+
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Sep 7
11:41:15 2011
@@ -76,6 +76,13 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-configuration</artifactId>
+ <!-- TODO uncomment when repository admin will be finished
+ <scope>runtime</scope>
+ -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-metadata-consumer</artifactId>
<scope>runtime</scope>
</dependency>
@@ -739,7 +746,7 @@
</goals>
<configuration>
<tasks>
- <copy overwrite="true"
file="${basedir}/src/test/resources/log4j.xml"
todir="${project.build.directory}/classes" />
+ <copy overwrite="true"
file="${basedir}/src/test/tomcat/log4j.xml"
todir="${project.build.directory}/classes" />
<delete dir="${basedir}/src/main/webapp/WEB-INF/lib" />
</tasks>
</configuration>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Wed Sep 7
11:41:15 2011
@@ -42,6 +42,9 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
+ <!-- TODO uncomment when repository admin will be finished
+ <scope>runtime</scope>
+ -->
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
Modified:
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java?rev=1166130&r1=1166129&r2=1166130&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
(original)
+++
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
Wed Sep 7 11:41:15 2011
@@ -104,6 +104,12 @@ public class AuditEvent
public static final String REMOVE_PATTERN = "Removed File Type Pattern";
public static final String MERGE_REPO_REMOTE = "Merged Staging Repository
Triggered Remotely";
+
+ public static final String ADD_PROXY_CONNECTOR = "Added Proxy Connector";
+
+ public static final String DELETE_PROXY_CONNECTOR = "Deleted Proxy
Connector";
+
+ public static final String MODIFY_PROXY_CONNECTOR = "Updated Proxy
Connector";
private String repositoryId;
